Clone in a terminal:
Commit 1f89b20
Johan Mattsson - 2017-08-05T16:11:01+00:00
1f89b20a1881b8b9b66a0a9569e008cf7fed060ajohan.mattsson.m@gmail.com

Merge branch 'master' of github.com:johanmattssonm/birdfont

Changed files (231)

Diff

diff --git a/.gitignore b/.gitignoreindex ca6fdcd..a25c17f 100644--- a/.gitignore+++ b/.gitignore@@ -5,3 +5,4 @@ libbirdfont/Config.vala scripts/config.py libbirdgems.vapi libbirdfont.vapi+*~diff --git a/.travis.yml b/.travis.ymldeleted file mode 100644index a701018..0000000--- a/.travis.yml+++ /dev/null@@ -1,13 +0,0 @@-language: c-compiler: gcc-before_install:-  - sudo add-apt-repository ppa:vala-team/ppa -y-  - sudo add-apt-repository ppa:birdfont-team/birdfont -y-  - sudo apt-get update -qq-  - sudo apt-get install -qq libglib2.0-dev libgtk-3-dev-         libsqlite3-dev valac libxmlbird-dev libgee-dev -         libwebkitgtk-3.0-dev libnotify-dev valac-0.22-         python3-script:-  - python3 ./configure --nonnull-  - python3 ./scripts/linux_build.pydiff --git a/NEWS b/NEWSindex 4400ae9..3a65c6b 100644--- a/NEWS+++ b/NEWS@@ -1,9 +1,44 @@+birdfont (2.19.0) stable;++  * Huge amount of kerning pairs supported in the extended GPOS table++ -- Johan Mattsson <johan.mattsson.m@gmail.com>  mån 10 okt 2016 14:38:53 CEST++birdfont (2.16.12) stable;++  * Platform independet scrollbar+  * Bug fixes++ -- Johan Mattsson <johan.mattsson.m@gmail.com>  mån 10 okt 2016 14:38:53 CEST++birdfont (2.16.9) stable;++  * RTL (right-to-left) writing in kerning tab+  * Bug fixes++ -- Johan Mattsson <johan.mattsson.m@gmail.com>  lör  1 okt 2016 09:38:00 CEST++birdfont (2.16.0) stable;++  * New freehand tool+  * Rotate objects and point handles with 45 degree steps+  * Bug fixes++ -- Johan Mattsson <johan.mattsson.m@gmail.com>  Sun Jun 12 19:53:43 CEST 2016++birdfont (2.15.6) stable;++  * Editable .notdef character+  * Bug fixes in the SVG parser++ -- Johan Mattsson <johan.mattsson.m@gmail.com>  Fri Jan 22 13:10:07 CET 2016+ birdfont (2.15.0) stable;    * Speed optimizations   * Bug fixes - -- Johan Mattsson <johan.mattsson.m@gmail.com  Fri Dec 11 22:26:42 CET 2015+ -- Johan Mattsson <johan.mattsson.m@gmail.com>  Fri Dec 11 22:26:42 CET 2015  birdfont (2.14.0) stable; @@ -11,7 +46,7 @@ birdfont (2.14.0) stable;   * Sandbox support on Mac OS   * Bug fixes - -- Johan Mattsson <johan.mattsson.m@gmail.com  Thu Nov 12 20:45:02 CET 2015+ -- Johan Mattsson <johan.mattsson.m@gmail.com>  Thu Nov 12 20:45:02 CET 2015  birdfont (2.13.0) stable; @@ -22,7 +57,7 @@ birdfont (2.13.0) stable;   * Swashes (OpenType feature tag: swsh)   * Parse circles, ellipses and lines in SVG files - -- Johan Mattsson <johan.mattsson.m@gmail.com  Mon Oct 26 11:33:09 CET 2015+ -- Johan Mattsson <johan.mattsson.m@gmail.com>  Mon Oct 26 11:33:09 CET 2015  birdfont (2.12.0) stable; diff --git a/README.md b/README.mdindex 7e813c7..296baa3 100644--- a/README.md+++ b/README.md@@ -10,24 +10,20 @@ export SVG, EOT and TTF fonts.     Webpage: http://birdfont.org     Bugtracker: http://birdfont.org/bugtracker/my_view_page.php -[![Build Status](https://travis-ci.org/johanmattssonm/birdfont.svg)]-(https://travis-ci.org/johanmattssonm/birdfont)- ## Building from Source  Install vala and all required libraries, they are most likely in packages with a -dev or -devel affix:      valac-    font-roboto     python3-doit-    libgee-dev+    libxmlbird-dev+    libgee-0.8-dev     libglib2.0-dev      libgtk-3-dev -    libwebkitgtk-3.0-dev +    libwebkit2gtk-3.0-dev      libnotify-dev     libsqlite3-dev-    libxmlbird-dev  XML Bird is available from [birdfont.org][xmlbird]. diff --git a/birdfont-test/TestRunner.vala b/birdfont-test/TestRunner.valaindex 5b363b4..96d39cd 100644--- a/birdfont-test/TestRunner.vala+++ b/birdfont-test/TestRunner.vala@@ -37,7 +37,7 @@ public class TestRunner : NativeWindow, GLib.Object  { 		if (type == "SVG") { 			File f = File.new_for_path (file); 			Font font = new Font ();-			import_svg_file (font, f, SvgType.REGULAR);+			import_svg_file (font, f); 		} else if (type == "BF") { 			Font font = new Font (); 			font.set_font_file (file);diff --git a/birdfont/GtkWindow.vala b/birdfont/GtkWindow.valaindex d5851cb..5dad039 100644--- a/birdfont/GtkWindow.vala+++ b/birdfont/GtkWindow.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2012 2013 2014 2015 Johan Mattsson+	Copyright (C) 2012s 2013 2014 Johan Mattsson  	This program is free software: you can redistribute it and/or modify 	it under the terms of the GNU General Public License as published by@@ -41,23 +41,11 @@ public class GtkWindow : Gtk.Window, NativeWindow { 	string clipboard_svg = ""; 	string inkscape_clipboard = ""; 	-	Scrollbar scrollbar;-	bool scrollbar_supress_signal = false;-	-	/** Text input and callbacks. */-	public static bool text_input_is_active = false;-	TextListener text_listener = new TextListener ("", "", "");-	Label text_input_label;-	Entry text_entry;-	Box text_box;-	Gtk.Button submit_text_button;-	 	ToolboxCanvas toolbox; 	 	Task background_task = new Task(idle); 	 	public GtkWindow (string title) {-		scrollbar = new Scrollbar (Orientation.VERTICAL, new Adjustment (0, 0, 1, 1, 0.01, 0.1)); 		((Gtk.Window)this).set_title ("BirdFont"); 	} 	@@ -65,21 +53,10 @@ public class GtkWindow : Gtk.Window, NativeWindow { 	} 	 	public void init () {-		Notify.init ("Fonts have been exported.");-		-		clipboard = Clipboard.get_for_display (get_display (), Gdk.SELECTION_CLIPBOARD);-+		Notify.init ("BirdFont"); 		Signal.connect(this, "notify::is-active", (GLib.Callback) window_focus, null); -		scrollbar.value_changed.connect (() => {-			double p;-			-			if (!scrollbar_supress_signal) {-				p = scrollbar.get_value () / (1 - scrollbar.adjustment.page_size);-				FontDisplay display = MainWindow.get_current_display ();-				display.scroll_to (p);-			}-		});+		clipboard = Clipboard.get_for_display (get_display (), Gdk.SELECTION_CLIPBOARD); 		 		delete_event.connect (() => { 			MenuTab.quit ();@@ -91,26 +68,25 @@ public class GtkWindow : Gtk.Window, NativeWindow { 		glyph_canvas_area = new GlyphCanvasArea (MainWindow.glyph_canvas);  		html_canvas = new WebView ();-		WebKit.set_cache_model (CacheModel.DOCUMENT_VIEWER);-		html_canvas.get_settings ().enable_default_context_menu = false;-		 		html_box = new ScrolledWindow (null, null); 		html_box.set_policy (PolicyType.NEVER, PolicyType.AUTOMATIC); 		html_box.add (html_canvas);-		html_canvas.set_editable (true); 		 		MainWindow.get_tab_bar ().signal_tab_selected.connect ((f, tab) => { 			string uri = ""; 			string html = ""; 			FontDisplay fd = tab.get_display (); 			-			scrollbar.set_visible (fd.has_scrollbar ());-			 			if (fd.get_name () == "Preview") { 				uri = Preview.get_uri (); 				html = Preview.get_html_with_absolute_paths (); 										-				html_canvas.load_html_string (html, uri);+				try {	+					html_canvas.load_html (html, uri);+				} catch (Error e) {+					warning (e.message);+					warning ("Failed to load html into canvas.");+				} 				 				// show the webview when loading has finished  				html_box.set_visible (true); @@ -131,30 +107,9 @@ public class GtkWindow : Gtk.Window, NativeWindow { 		canvas_box = new Box (Orientation.HORIZONTAL, 0); 		canvas_box.pack_start (glyph_canvas_area, true, true, 0); 		canvas_box.pack_start (html_box, true, true, 0);-		canvas_box.pack_start (scrollbar, false, true, 0);--		submit_text_button = new Gtk.Button ();-		submit_text_button.set_label ("Submit");-		text_input_label = new Label ("   " + "Text");-		text_entry = new Entry ();-		text_box = new Box (Orientation.HORIZONTAL, 6);-		text_box.pack_start (text_input_label, false, false, 0);-		text_box.pack_start (text_entry, true, true, 0);-		text_box.pack_start (submit_text_button, false, false, 0);--		text_entry.changed.connect (() => {-			text_listener.signal_text_input (text_entry.text);-		});--		submit_text_button.clicked.connect (() => {-			text_listener.signal_submit (text_entry.text);-			text_input_is_active = false;-		});-		-		tab_box = new Box (Orientation.VERTICAL, 0); 		+		tab_box = new Box (Orientation.VERTICAL, 0);		 		tab_box.pack_start (new TabbarCanvas (MainWindow.get_tab_bar ()), false, false, 0);-		tab_box.pack_start (text_box, false, false, 5);	 		tab_box.pack_start (canvas_box, true, true, 0);  		toolbox = new ToolboxCanvas (MainWindow.get_toolbox ()); @@ -165,7 +120,7 @@ public class GtkWindow : Gtk.Window, NativeWindow { 		Box vbox = new Box (Orientation.VERTICAL, 0); 		vbox.pack_start(list_box, true, true, 0); 		add (vbox);-		+ 		try { 			set_icon_from_file ((!) SearchPaths.find_file (null, "birdfont_window_icon.png").get_path ()); 		} catch (GLib.Error e) {@@ -173,18 +128,13 @@ public class GtkWindow : Gtk.Window, NativeWindow { 		}  		key_press_event.connect ((t, event) => {-			if (!GtkWindow.text_input_is_active) {-				GtkWindow.reset_modifier (event.state);-				TabContent.key_press (event.keyval);-			}-			+			TabContent.key_press (event.keyval);+ 			return false; 		}); 		 		key_release_event.connect ((t, event) => {-			if (!GtkWindow.text_input_is_active) {-				TabContent.key_release (event.keyval);-			}+			TabContent.key_release (event.keyval); 			 			return false; 		});@@ -192,14 +142,14 @@ public class GtkWindow : Gtk.Window, NativeWindow { 		size_allocate.connect(() => { 			GlyphCanvas.redraw (); 		});-		+ 		show_all ();-		-		scrollbar.set_visible (false); -		hide_text_input ();-		-		MainWindow.open_recent_files_tab ();+		MainWindow.open_recent_files_tab ();		++#if FREE+		MainWindow.show_license_dialog ();+#endif 	}  	public void window_focus (void* data) {@@ -233,17 +183,6 @@ public class GtkWindow : Gtk.Window, NativeWindow { 		set_title (@"$(f.full_name)"); 	} -	public void set_scrollbar_size (double size) {-		scrollbar.adjustment.page_size = size;		-		scrollbar.set_visible (size != 0);-	}-	-	public void set_scrollbar_position (double position) {-		scrollbar_supress_signal = true;-		scrollbar.adjustment.value = position * (1 - scrollbar.adjustment.page_size);-		scrollbar_supress_signal = false;-	}- 	public void dump_clipboard_content (Clipboard clipboard, SelectionData selection_data) { 		string d; 		return_if_fail (!is_null (selection_data));@@ -428,26 +367,6 @@ public class GtkWindow : Gtk.Window, NativeWindow { 		return fn; 	} 	-	public void hide_text_input () {-		text_listener = new TextListener ("", "", "");-		text_box.hide ();-		text_input_is_active = false;-	}-	-	public void set_text_listener (TextListener listener) {-		text_listener = listener;-		text_input_label.set_text ("   " + listener.label);-		submit_text_button.set_label (listener.button_label);-		text_box.show ();-		text_entry.set_text (listener.default_text);-		text_entry.activate.connect (() => {-			text_listener.signal_submit (text_entry.text);-			text_input_is_active = false;-		});-		text_entry.grab_focus ();-		text_input_is_active = true;-	}-	 	public bool convert_to_png (string from, string to) { 		Pixbuf pixbuf; 		string folder;@@ -481,8 +400,8 @@ public class GtkWindow : Gtk.Window, NativeWindow { 		} catch (GLib.Error e) { 			warning (e.message); 		}-	} -	+	}+ 	public void run_non_blocking_background_thread (Task t) { 		unowned Thread<void*> bg; 		@@ -643,20 +562,10 @@ class TabbarCanvas : DrawingArea {  		draw.connect ((t, e)=> { 			Gtk.Allocation alloc;-			Context cr;-			StyleContext context;-			Gdk.RGBA color;-						+			Context cr;						+									 			cr = cairo_create (get_window ()); 			get_allocation (out alloc);--			context = get_style_context ();-			context.add_class (STYLE_CLASS_BUTTON);-			color = context.get_background_color (Gtk.StateFlags.NORMAL);-			-			if (color.alpha > 0) {-				tabbar.set_background_color (color.red, color.green, color.blue);-			} 						 			tabbar.draw (cr, alloc.width, alloc.height); 			return true;diff --git a/birdfont/Main.vala b/birdfont/Main.valaindex be3dd94..e265eb8 100644--- a/birdfont/Main.vala+++ b/birdfont/Main.vala@@ -21,7 +21,7 @@ public static int main (string[] arg) { 	GtkWindow native_window; 	MainWindow window; 	BirdFont.BirdFont birdfont;-+	 	birdfont = new BirdFont.BirdFont (); 	birdfont.init (arg, null, "birdfont", null); 	Gtk.init (ref arg);@@ -31,11 +31,9 @@ public static int main (string[] arg) {  	window.set_native (native_window); 	native_window.init ();+	birdfont.load_font_from_command_line (); -	BirdFont.BirdFont.load_font_from_command_line ();-	 	Gtk.main ();+	 	return 0; }--diff --git a/birdui/BoxLayout.vala b/birdui/BoxLayout.valadeleted file mode 100644index df7ee8d..0000000--- a/birdui/BoxLayout.vala+++ /dev/null@@ -1,215 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Gee;-using SvgBird;-using B;-using Cairo;--namespace Bird {--public enum BoxOrientation {-	HORIZONTAL,-	VERTICAL-}--class BoxLayout : Component {--	public BoxOrientation orientation { get; private set; }-	-	public BoxLayout (XmlElement layout_tag, BoxOrientation orientation, Defs defs) {-		base (layout_tag, defs);-		this.orientation = orientation;-	}--	public override void draw (Context cairo) {-		cairo.save ();-		cairo.translate (padded_x, padded_y);-		clip (cairo);-		-		foreach (Component component in components) {-			component.draw (cairo);-		}--		cairo.restore ();-	}-			-	bool is_width_remainder (Component component) {-		return component.style.property_equals ("width", "remainder");-	}--	bool is_height_remainder (Component component) {-		return component.style.property_equals ("height", "remainder");-	}--	/** The smallest size this layout can be. */-	public override void get_min_size (out double min_width, out double min_height) {-		min_width = 0;-		min_height = 0;-		-		if (orientation == BoxOrientation.HORIZONTAL) {-			foreach (Component component in components) {-				double w, h;-				-				component.get_min_size (out w, out h);-				min_width += w;-				-				if (h > min_height) {-					min_height = h;-				}-			}	-		} else {-			foreach (Component component in components) {-				double w, h;-				-				component.get_min_size (out w, out h);	-				min_height += h;-				-				if (w > min_width) {-					min_width = w;-				}-			}-		}-		-		min_width += get_padding_left ();-		min_width += get_padding_right ();-		min_height += get_padding_top ();-		min_height += get_padding_bottom ();-		-		limit_size (ref min_width, ref min_height);-	}--	public override void layout (double parent_width, double parent_height) {-		double w, h;-		-		get_min_size (out w, out h);-		int remainders = count_remainders ();-		-		if (!is_width_remainder (this)) {-			width = w;-		}-		-		if (!is_height_remainder (this)) {-			height = h;-		}-		-		if (remainders > 0) {-			double remainder_size;-			-			if (orientation == BoxOrientation.HORIZONTAL) {-				remainder_size = (parent_width - w) / remainders;-				layout_variable_size (remainder_size, parent_height);-			} else {-				remainder_size = (parent_height - h) / remainders;-				layout_variable_size (remainder_size, parent_width);-			}-		}-		-		if (orientation == BoxOrientation.HORIZONTAL) {-			foreach (Component component in components) {-				component.layout (parent_width, h);-			}-		} else {-			foreach (Component component in components) {-				component.layout (w, parent_height);-			}-		}-		-		layout_positions ();-	}-	-	int count_remainders () {-		int remainders = 0;-		-		if (orientation == BoxOrientation.HORIZONTAL) {-			foreach (Component component in components) {-				if (is_width_remainder (component)) {-					remainders++;-				}-			}-		} else {-			foreach (Component component in components) {-				if (is_height_remainder (component)) {-					remainders++;-				}-			}-		}-		-		return remainders;-	}-	-	void layout_variable_size (double remainder_size, double fixed_size) {-		double w, h;-		-		w = 0;-		h = 0;-		foreach (Component component in components) {-			bool width_remainder = is_width_remainder (component);-			bool height_remainder = is_height_remainder (component);-			-			if (width_remainder && orientation == BoxOrientation.HORIZONTAL) {-				w = remainder_size;-				w -= component.get_padding_left ();-				w -= component.get_padding_right ();-				h = fixed_size;-			}-			-			if (height_remainder && orientation == BoxOrientation.VERTICAL) {-				w = fixed_size;-				h = remainder_size;-				h -= component.get_padding_top ();-				h -= component.get_padding_bottom ();-			}-			-			if (width_remainder || height_remainder) {-				double min_width, min_height;-				component.get_min_size (out min_width, out min_height);-				-				if (w < min_width) {-					w = min_width;-				}-				-				if (h < min_height) {-					h = min_height;-				}-				-				component.limit_size (ref w, ref h);-				component.width = w;-				component.height = h;-			}-		}-	}--	void layout_positions () {-		double child_x = 0;-		double child_y = 0;--		foreach (Component component in components) {-			component.x = child_x + component.get_padding_left ();-			component.y = child_y + component.get_padding_top ();--			if (orientation == BoxOrientation.HORIZONTAL) {-				child_x = component.x + component.padded_width + get_padding_right ();-			} else {-				child_y = component.y + component.padded_height  + get_padding_bottom ();-			}-		}-	}--	public override string to_string () {-		return "BoxLayout";-	}-}--}diff --git a/birdui/Component.vala b/birdui/Component.valadeleted file mode 100644index f410e59..0000000--- a/birdui/Component.vala+++ /dev/null@@ -1,409 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using B;-using SvgBird;-using Gee;-using Cairo;--namespace Bird {--public abstract class Component : GLib.Object {-	public double width { get; protected set; }-	public double height { get; protected set; }-	-	public double padded_width {-		get {-			return width + get_padding_top () + get_padding_bottom ();-		}-	}-	-	public double padded_height { -		get {-			return height + get_padding_left () + get_padding_right ();-		}-	}--	public double padded_x {-		get {-			return x + get_padding_top ();-		}-	}-	-	public double padded_y { -		get {-			return y + get_padding_left ();-		}-	}-	-	/** Vertical placement for this component relative to the parent container. */-	public double x { get; protected set; }-	-	/** Horizontal placement for this component relative to the parent container. */-	public double y { get; protected set; }--	/** The parts this component is made of. */-	protected ArrayList<Component> components = new ArrayList<Component> ();--	XmlElement component_tag;-	-	/** Style sheet and other SVG definitions. */-	Defs defs = new Defs ();-	protected SvgStyle style = new SvgStyle ();--	string? css_class = null;-	string? id = null;--	Overflow overflow = Overflow.VISIBLE;--	public Component.load (string file_name, double width, double height) {-		this.width = width;-		this.height = height;-		load_file (file_name, null);-		layout (width, height);-	}--	/** Parse component ui file but don't do layout. */-	internal Component.load_component (string file_name, Component parent) {-		load_file (file_name, parent);-	}-	-	public Component (XmlElement component_tag, Defs defs) {-		this.defs = defs;-		this.component_tag = component_tag;-		set_identification ();-		parse (component_tag);-	}--	public Component.embedded (XmlElement component_tag, Defs defs) {-		this.defs = defs;-		this.component_tag = component_tag;-		set_identification ();-	}--	void set_identification () {-		foreach (Attribute attribute in component_tag.get_attributes ()) {-			string attribute_name = attribute.get_name ();-			-			if (attribute_name == "id") {-				id = attribute.get_content ();-			} else if (attribute_name == "class") {-				css_class = attribute.get_content ();-			}-		}-	}--	private void inherit_styles_sheet (Defs defs) {-		this.defs = defs;-	}--	protected void parse_style (XmlElement style_tag) {-		defs = defs.shallow_copy ();-		StyleSheet style_sheet = StyleSheet.parse (defs, style_tag);-		defs.style_sheet.merge (style_sheet);-	}-	-	protected void parse_svg (XmlElement svg_tag) {-		foreach (Attribute attribute in svg_tag.get_attributes ()) {-			string attribute_name = attribute.get_name ();-			-			if (attribute_name == "file") {-				string file_name = attribute.get_content ();-				SvgComponent svg = new SvgComponent (svg_tag, defs, file_name);-				add_component (svg);	-			}-		}-	}--	protected void add_component (Component component) {-		components.add (component);-		component.set_style_properties (this);-	}--	protected void set_style_properties (Component parent) {-		inherit_styles_sheet (parent.defs);-		style = SvgStyle.parse (parent.defs, parent.style, component_tag);		-		set_overflow_property_from_css ();-		set_identification ();-	}-	-	protected void set_overflow_property_from_css () {-		string? css_overflow = style.get_css_property ("overflow");-		-		if (css_overflow != null) {-			string overflow_property = (!) css_overflow;-			-			if (overflow_property == "hidden") {-				overflow = Overflow.HIDDEN;-			} else if (overflow_property == "visible") {-				overflow = Overflow.VISIBLE;-			}-		}-	}--	protected void parse_layout (XmlElement layout_tag) {-		string type = "";-		-		foreach (Attribute attribute in layout_tag.get_attributes ()) {-			string attribute_name = attribute.get_name ();-			-			if (attribute_name == "type") {-				type = attribute.get_content ();				-			}-		}-		-		if (type == "hbox") {-			HBox hbox = new HBox (layout_tag, defs);-			add_component (hbox);-		} else if (type == "vbox") {-			VBox vbox = new VBox (layout_tag, defs);-			add_component (vbox);-		} else {-			warning (type + " layout of type is supported in this verison.");-		}-	}-	-	protected void parse_component (XmlElement component_tag) {-		foreach (Attribute attribute in component_tag.get_attributes ()) {-			string attribute_name = attribute.get_name ();-			-			if (attribute_name == "file") {-				string file_name = attribute.get_content ();-				UI ui = new UI.load_component (file_name, this);-				-				foreach (Component component in ui.components) {-					add_component (component);-					-					SvgStyle copied_style;-					copied_style = SvgStyle.parse (defs, style, component_tag);		-					copied_style.apply (component.style);-					component.style = copied_style;-				}-			}-		}-	}-	-	protected void parse (XmlElement component_tag) {-		foreach (XmlElement tag in component_tag) {-			string tag_name = tag.get_name ();-			-			if (tag_name == "ui") {-				parse (tag);-			} else if (tag_name == "layout") {-				parse_layout (tag);-			} else if (tag_name == "component") {-				parse_component (tag);-			} else if (tag_name == "svg") {-				parse_svg (tag);-			} else if (tag_name == "style") {-				parse_style (tag);-			} else {-				unused_tag (tag_name);-			}-		}-	}--	internal void unused_attribute (string attribute) {-		warning ("The attribute " + attribute + " is not known in this version.");-	}-	-	internal void unused_tag (string tag_name) {-		warning ("The tag " + tag_name + " is not known in this version.");-	}--	public void load_file (string file_name, Component? parent) {-		if (file_name.has_suffix (".ui")) {-			load_layout (file_name, parent);-		} else if (file_name.has_suffix (".svg")) {-			SvgComponent svg = new SvgComponent.for_file (file_name);-			add_component (svg);	-		} else {-			warning (file_name + " is not a ui file or svg file.");-		}-	}--	public void load_layout (string file_name, Component? parent) {-		string? path = find_file (file_name);-		-		if (path == null) {-			warning (file_name + " not found.");-			return;-		}-		-		string xml_data;-		File layout_file = File.new_for_path ((!) path); -		-		try {-			FileUtils.get_contents((!) layout_file.get_path (), out xml_data);-		} catch (GLib.Error error) {-			warning (error.message);-			return;-		}--		XmlTree xml_parser = new XmlTree (xml_data);		-		XmlElement tag = xml_parser.get_root ();-		-		if (parent == null) {-			component_tag = tag;-			defs = new Defs ();-		} else {-			Component p = (!) parent;-			component_tag = p.component_tag;-			defs = p.defs;-		}-		-		parse (tag);-	}-	-	public static string find_file (string file_name) {-		File file = File.new_for_path ("birdui/" + file_name);-		-		if (file.query_exists ()) {-			return (!) file.get_path ();-		}-		-		return file_name;-	}-	-	public virtual void get_min_size (out double min_width, out double min_height) {-		min_width = width;-		min_height = height;-		-		if (unlikely (components.size > 1)) {-			warning ("A component has several parts but no layout has been set.");-		}-		-		foreach (Component component in components) {-			component.get_min_size (out min_width, out min_height);-		}--		min_width += get_padding_left ();-		min_width += get_padding_right ();-		min_height += get_padding_top ();-		min_height += get_padding_bottom ();-	}-	-	public virtual void layout (double parent_width, double parent_height) {-		warning ("A component without a layout was added to the view.");--		double w, h;-		get_min_size (out w, out h);--		width = w;-		height = h;-		-		foreach (Component component in components) {-			component.layout (parent_width, parent_height);-		}-	}-	-	public void clip (Context cairo) {-		if (overflow == Overflow.HIDDEN) {-			cairo.rectangle (0, 0, width, height);-			cairo.clip ();-		}-	}-	-	public abstract void draw (Context cairo);-	-	public virtual void motion_notify_event (double x, double y) {	-	}-	-	public virtual void button_press_event (uint button, double x, double y) {	-	}-	-	public virtual string to_string () {-		return @"$(component_tag.get_name ())";-	}-	-	public void print_tree () {-		print_tree_level (0);-	}--	protected void print_tree_level (int indent) {-		for (int i = 0; i < indent; i++) {-			print ("\t");-		}-		-		print (@"$(to_string ()) width: $padded_width, height: $padded_height x $x y $y $(style)\n");-		-		foreach (Component component in components) {-			component.print_tree_level (indent + 1);-		}-	}-	-	protected double get_padding_bottom () {-		return SvgFile.parse_number (style.get_css_property ("padding-bottom"));-	}--	protected double get_padding_top () {-		return SvgFile.parse_number (style.get_css_property ("padding-top"));-	}--	protected double get_padding_left () {-		return SvgFile.parse_number (style.get_css_property ("padding-left"));-	}--	protected double get_padding_right () {-		return SvgFile.parse_number (style.get_css_property ("padding-right"));-	}--	protected void limit_size (ref double width, ref double height) {-		string? min_width = style.get_css_property ("min-width");-		if (min_width != null) {-			double w = SvgFile.parse_number (min_width);-			if (width < w) {-				width = w;-			}-		}--		string? min_height = style.get_css_property ("min-height");-		if (min_height != null) {-			double h = SvgFile.parse_number (min_height);-			-			if (height < h) {-				height = h;-			}-		}-		-		string? max_width = style.get_css_property ("max-width");-		if (max_width != null) {-			double w = SvgFile.parse_number (max_width);-			-			if (width > w) {-				width = w;-			}-		}--		string? max_height = style.get_css_property ("max-height");-		if (max_height != null) {-			double h = SvgFile.parse_number (max_height);-			-			if (height > h) {-				height = h;-			}-		}-		-		if (width < 0) {-			width = 0;-		}--		if (height < 0) {-			height = 0;-		}-	}-}--}-diff --git a/birdui/GtkWidget.vala b/birdui/GtkWidget.valadeleted file mode 100644index c31e14d..0000000--- a/birdui/GtkWidget.vala+++ /dev/null@@ -1,59 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Gtk;-using Gdk;-using Cairo;-using Math;--namespace Bird {--public class Widget : DrawingArea {-	-	UI component;-	-	public Widget (UI main_component) {		-		component = main_component;--		add_events (EventMask.BUTTON_PRESS_MASK -			| EventMask.POINTER_MOTION_MASK-			| EventMask.LEAVE_NOTIFY_MASK);-			  -		motion_notify_event.connect ((event)=> {-			component.motion_notify_event (event.x, event.y);-			return true;-		});	-				-		button_press_event.connect ((event)=> {-			component.button_press_event (event.button, event.x, event.y);-			return true;-		});--		draw.connect ((event) => {-			Context cairo_context = cairo_create (get_window ());-			component.draw (cairo_context);-			return true;-		});-		-		int width = (int) rint (component.padded_width);-		int height = (int) rint (component.padded_height);-		set_size_request (width, height);--		size_allocate.connect((allocation) => {-			component.resize (allocation.width, allocation.height);-		});-	}-}--}diff --git a/birdui/GtkWindow.vala b/birdui/GtkWindow.valadeleted file mode 100644index b27b127..0000000--- a/birdui/GtkWindow.vala+++ /dev/null@@ -1,39 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Bird;-using Gtk;--int main (string[] args) {-	Gtk.init (ref args);-	-	Window window = new Window ();-	window.set_title ("UI Bird");-	window.destroy.connect (Gtk.main_quit);-	-	UI layout = new UI ("test.ui", 700, 200);-	-	layout.print_tree ();-	-	Bird.Widget primary_layout = new Bird.Widget (layout);--	Box vbox = new Box (Orientation.VERTICAL, 0);-	vbox.pack_start(primary_layout, true, true, 0);-	window.add (vbox);-	-	window.show_all ();-	-	Gtk.main ();-	return 0;-}diff --git a/birdui/HBox.vala b/birdui/HBox.valadeleted file mode 100644index d7af576..0000000--- a/birdui/HBox.vala+++ /dev/null@@ -1,31 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Gee;-using B;-using SvgBird;--namespace Bird {--class HBox : BoxLayout {-	public HBox (XmlElement layout, Defs defs) {-		base (layout, BoxOrientation.HORIZONTAL, defs);-	}-	-	public override string to_string () {-		return "HBox";-	}-}--}diff --git a/birdui/Overflow.vala b/birdui/Overflow.valadeleted file mode 100644index 3a0ed04..0000000--- a/birdui/Overflow.vala+++ /dev/null@@ -1,22 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--namespace Bird {--public enum Overflow {-	HIDDEN,-	VISIBLE-}--}diff --git a/birdui/Style.vala b/birdui/Style.valadeleted file mode 100644index d1e3d2c..0000000--- a/birdui/Style.vala+++ /dev/null@@ -1,34 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using B;-using SvgBird;-using Gee;-using Cairo;--namespace Bird {--public class Style : GLib.Object {-	public SvgStyle svg_style;-	-	public Style () {-		svg_style = new SvgStyle ();-	}-	-	public Style.for_svg (SvgStyle svg_style) {-		this.svg_style = svg_style;-	}-}--}diff --git a/birdui/SvgComponent.vala b/birdui/SvgComponent.valadeleted file mode 100644index 416cc28..0000000--- a/birdui/SvgComponent.vala+++ /dev/null@@ -1,102 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using B;-using SvgBird;-using Gee;-using Cairo;--namespace Bird {--class SvgComponent : Component {-	string? path = null;-	string file_name = "";-	SvgDrawing? drawing = null;-	-	public SvgComponent (XmlElement svg_component_tag, Defs defs, string svg_file) {-		base.embedded (svg_component_tag, defs);-		load_svg (svg_file);-	}--	public SvgComponent.for_file (string svg_file) {-		base.embedded (new XmlElement.empty (), new Defs ());-		load_svg (svg_file);-	}--	public override void get_min_size (out double min_width, out double min_height) {-		min_width = 0;-		min_height = 0;-		-		if (drawing != null) {-			SvgDrawing svg = (!) drawing;-			min_width = svg.width + get_padding_left () + get_padding_right ();-			min_height = svg.height + get_padding_bottom () + get_padding_top ();-		}-	}-	-	public override void layout (double parent_width, double parent_height) {-		if (unlikely (components.size > 0)) {-			warning ("SVG files can not have subviews.");-		}-		-		if (drawing != null) {-			SvgDrawing svg = (!) drawing;-			width = svg.width;-			height = svg.height;-		}-	}-			-	public override string to_string () {-		return "Svg: " + file_name;-	}--	private void load_svg (string file_name) {-		this.file_name = file_name;-		path = find_file (file_name);-		-		if (path == null) {-			warning (file_name + " not found.");-			return;-		}-				-		string xml_data;-		File svg_file = File.new_for_path ((!) path); -		try {-			FileUtils.get_contents((!) svg_file.get_path (), out xml_data);-		} catch (GLib.Error error) {-			warning (error.message);-			return;-		}-		-		SvgFile svg_parser = new SvgFile ();-		drawing = svg_parser.parse_svg_data (xml_data);-	}--	public override void draw (Context cairo) {-		cairo.save ();-		cairo.translate (padded_x, padded_y);-		clip (cairo);-		-		if (drawing != null) {-			SvgDrawing svg = (!) drawing;-			svg.draw (cairo);-		}-		-		cairo.restore ();-	}--}--}-diff --git a/birdui/VBox.vala b/birdui/VBox.valadeleted file mode 100644index d3d81cb..0000000--- a/birdui/VBox.vala+++ /dev/null@@ -1,32 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Gee;-using B;-using SvgBird;--namespace Bird {-	-class VBox : BoxLayout {-	public VBox (XmlElement layout, Defs defs) {-		base (layout, BoxOrientation.VERTICAL, defs);-	}-	-	public override string to_string () {-		return "VBox";-	}--}--}diff --git a/build.py b/build.pyindex a71e729..97633ce 100755--- a/build.py+++ b/build.py@@ -10,25 +10,18 @@ from scripts import version  if platform == 'msys': 	process_tasks(dodo.make_libbirdgems('libbirdgems.dll', []))-	process_tasks(dodo.make_libbirdgems('libsvgbird.dll', []))-	process_tasks(dodo.make_libbirdfont('libbirdfont.dll', ['libbirdgems.dll', 'libsvgbird.dll']))-	process_tasks(dodo.make_libbirdfont('libbirdfont.dll', ['libbirdgems.dll', 'libsvgbird.dll']))-	process_tasks(dodo.make_birdfont_test('birdfont-test.exe', -		['libbirdgems.dll', 'libbirdfont.dll', 'libsvgbird.dll']))+	process_tasks(dodo.make_libbirdfont('libbirdfont.dll', ['libbirdgems.dll']))+	process_tasks(dodo.make_birdfont_test('birdfont-test.exe', ['libbirdgems.so', 'libbirdfont.so'])) elif platform == 'darwin': 	gems = "libbirdgems." + str(version.LIBBIRDGEMS_SO_VERSION) + '.dylib' 	bird = "libbirdfont." + str(version.SO_VERSION) + '.dylib';-	svg = "libsvgbird." + str(version.LIBSVGBIRD_SO_VERSION) + '.dylib';-	process_tasks(dodo.make_libsvgbird(svg, [])) 	process_tasks(dodo.make_libbirdgems(gems, [])) 	process_tasks(dodo.make_libbirdfont(bird, [gems])) 	process_tasks(dodo.task_man()) else:-	process_tasks(dodo.task_libsvgbird()) 	process_tasks(dodo.task_libbirdgems()) 	process_tasks(dodo.task_libbirdfont())-	process_tasks(dodo.make_birdfont_test('birdfont-test', -		['libsvgbird.so', 'libbirdgems.so', 'libbirdfont.so']))+	process_tasks(dodo.make_birdfont_test('birdfont-test', ['libbirdgems.so', 'libbirdfont.so']))  if config.GTK: 	process_tasks(dodo.task_birdfont())diff --git a/configure b/configureindex b0a9277..207fee4 100755--- a/configure+++ b/configure@@ -11,8 +11,7 @@ import re from scripts.run import run  TARGETS = ['libbirdfont', -           'libbirdgems',-           'libsvgbird',+           'libbirdgems',             'birdfont',             'birdfont-autotrace',            'birdfont-export',@@ -50,34 +49,13 @@ def test_program_version (program, a, b, c): 	version = [int(n) for n in v.split ('.')] 	return [a,b,c] <= version	 -def test_library_version (lib, required=True, version=None):+def test_library_version(pkg_config, lib, required=True, version=None): 	print ('Looking for library: ' + lib + '\t\t')-	process = subprocess.Popen ('pkg-config --modversion ' + lib, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)+	process = subprocess.Popen(pkg_config + ' --modversion ' + lib, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) 	v = process.stdout.readline().decode('utf-8') 	process.communicate()[0]-	-	if not process.returncode == 0:-		if required:-			print (FAIL + lib + ' not found' + ENDC)-			exit (1)-		else:-			return False-	-	if version == None:-		return True-	-	installed_version = v.split ('.');-	library_version = version.split ('.');-	-	if installed_version < library_version:-		if required:-			print (FAIL + lib + ' version >= ' + version + ' not found.' + ENDC)-			exit (1)-		else:-			return False-		-	return True-	+	return process.returncode == 0+ def has_posixvala (): 	posixvala = test_library_version ('posixvala') 	if not posixvala:@@ -87,10 +65,10 @@ def has_posixvala (): 		print (OKGREEN + 'Using posix profile.' + ENDC)			 	return 'True' -def configure(gtk, libbgee):+def configure(gtk, libbgee, valac, pkg_config): 	global gee 	-	if not test_program_version ('valac', 0, 16, 0):+	if not test_program_version(valac, 0, 16, 0): 		print (FAIL + 'valac is too old.' + ENDC) 		exit (1) @@ -101,10 +79,11 @@ def configure(gtk, libbgee): 				'gio-2.0',  				'glib-2.0',  				'gtk+-3.0',-				'webkitgtk-3.0', +				'webkit2gtk-4.0',  				'libsoup-2.4', 				'libnotify', 				'sqlite3',+				'xmlbird' 				] 	else: 		libs = [@@ -112,23 +91,25 @@ def configure(gtk, libbgee): 				'glib-2.0',  				'sqlite3', 				'fontconfig',+				'xmlbird' 				] -	test_library_version ('xmlbird', True, '1.2.0')+	test_library_version(pkg_config, 'xmlbird', True, '1.2.0')  	for lib in libs:-		test_library_version (lib)+		test_library_version(pkg_config, lib)  	if libbgee == 'Any':-		if test_library_version ('gee-0.8', False):+		if test_library_version(pkg_config, 'gee-0.8', False): 			gee = 'gee-0.8'-		elif test_library_version ('gee-1.0', False):+		elif test_library_version(pkg_config, 'gee-1.0', False): 			gee = 'gee-1.0' 		else: 			print (FAIL + 'Can not find libgee (version 0.8 or version 1.0).' + ENDC) 			exit (1) 	else:-		if not test_library_version (libbgee):+		if not test_library_version(pkg_config, libbgee):+			print (FAIL + 'Can not find lib gee.' + ENDC) 			exit (1) 		gee = libbgee; @@ -146,6 +127,7 @@ parser.add_option('-c', '--cc', dest='cc', help='C compiler', metavar='CC') parser.add_option('-g', '--gtk', dest='gtk', help='Build Gtk version, default is True', metavar='GTK') parser.add_option('-e', '--gee', dest='gee', help='Version of libgee', metavar='GEE') parser.add_option('-v', '--valac', dest='valac', help='Vala compiler', metavar='VALAC')+parser.add_option('-P', '--pkg-config', dest='pkg_config', help='Package config tool', metavar='PKG_CONFIG') parser.add_option('-n', '--nonnull', dest='nonnull', action="store_true", help='Enable compiletime checks for null pointers', metavar='NONNULL')  parser.add_option('', '--valac-flags', dest='valac_flags', help='Vala compiler flags for all targets', metavar='VALAC_FLAGS', default='')@@ -198,12 +180,14 @@ if not options.gee: 	options.gee = 'Any' if not options.valac: 	options.valac = 'valac'+if not options.pkg_config:+	options.pkg_config = 'pkg-config' if not options.nonnull: 	options.nonnull = False else: 	options.nonnull = True 	-configure(options.gtk, options.gee)+configure(options.gtk, options.gee, options.valac, options.pkg_config)  configfile.write_config(options.prefix) configfile.write_compile_parameters(options.prefix,@@ -211,6 +195,7 @@ configfile.write_compile_parameters(options.prefix, 									options.cc, 									gee, 									options.valac,+									options.pkg_config, 									options.nonnull, 									valacflags, 									cflags,diff --git a/dodo.py b/dodo.pyindex 13bac8e..76a3818 100644--- a/dodo.py+++ b/dodo.py@@ -1,5 +1,5 @@ """-Copyright (C) 2012 - 2016 Eduardo Naufel Schettino and Johan Mattsson+Copyright (C) 2012 2013 2014 2015 Eduardo Naufel Schettino and Johan Mattsson  This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -48,13 +48,6 @@ else:     LIBBIRDGEMS_SO_VERSION=version.LIBBIRDGEMS_SO_VERSION  if "kfreebsd" in sys.platform:-    LIBSVGBIRD_SO_VERSION=version.LIBSVGBIRD_SO_VERSION-elif "openbsd" in sys.platform:-    LIBSVGBIRD_SO_VERSION='${LIBbirdgems_VERSION}'-else:-    LIBSVGBIRD_SO_VERSION=version.LIBSVGBIRD_SO_VERSION--if "kfreebsd" in sys.platform:     SO_VERSION=version.SO_VERSION elif "openbsd" in sys.platform:     SO_VERSION='${LIBbirdfont_VERSION}'@@ -68,56 +61,54 @@ def soname(target_binary):     return '-Wl,-soname,' + target_binary  def make_birdfont(target_binary, deps):-    valac_command = config.VALAC + """\+    valac_command = """{valac} \         -C \         --vapidir=./ \         --basedir build/birdfont/ \-        """ + config.NON_NULL + """ \-        """ + config.VALACFLAGS.get("birdfont", "") + """ \+        {non_null} \+        {valacflags[birdfont]} \         --enable-experimental \         birdfont/*.vala \ 		--vapidir=./ \-		--pkg """ + config.GEE + """ \+		--pkg {gee} \ 		--pkg gio-2.0  \ 		--pkg cairo \ 		--pkg libsoup-2.4 \ 		--pkg gdk-pixbuf-2.0 \-		--pkg webkitgtk-3.0 \+		--pkg webkit2gtk-4.0 \ 		--pkg libnotify \ 		--pkg xmlbird \ 		--pkg libbirdfont \-		--pkg libsvgbird \-        """+        """.format(**config.SETTINGS)         -    cc_command = config.CC + " " + config.CFLAGS.get("birdfont", "") + """ \+    cc_command = """{cc} {cflags[birdfont]} \         -c C_SOURCE \ 		-D 'GETTEXT_PACKAGE="birdfont"' \         -I./build/libbirdfont \-        -I./build/libsvgbird \-		$(pkg-config --cflags sqlite3) \-		$(pkg-config --cflags """ + config.GEE + """) \-		$(pkg-config --cflags gio-2.0) \-		$(pkg-config --cflags cairo) \-		$(pkg-config --cflags glib-2.0) \-		$(pkg-config --cflags gdk-pixbuf-2.0) \-		$(pkg-config --cflags webkitgtk-3.0) \-		$(pkg-config --cflags libnotify) \-        -o OBJECT_FILE"""+		$({pkg-config} --cflags sqlite3) \+		$({pkg-config} --cflags {gee}) \+		$({pkg-config} --cflags gio-2.0) \+		$({pkg-config} --cflags cairo) \+		$({pkg-config} --cflags glib-2.0) \+		$({pkg-config} --cflags gdk-pixbuf-2.0) \+		$({pkg-config} --cflags webkit2gtk-4.0) \+		$({pkg-config} --cflags libnotify) \+        -o OBJECT_FILE""".format(**config.SETTINGS)         -    linker_command = config.CC + " " + config.LDFLAGS.get("birdfont", "") + """ \+    linker_command = """{cc} {ldflags[birdfont]} \         build/birdfont/*.o \ 		-L./build/bin -lbirdfont \-		$(pkg-config --libs sqlite3) \-		$(pkg-config --libs """ + config.GEE + """) \-		$(pkg-config --libs gio-2.0) \-		$(pkg-config --libs cairo) \-		$(pkg-config --libs glib-2.0) \-		$(pkg-config --libs gdk-pixbuf-2.0) \-		$(pkg-config --libs webkitgtk-3.0) \-		$(pkg-config --libs xmlbird) \-		$(pkg-config --libs libnotify) \-		-L./build -L./build/bin -l birdgems -l svgbird \-        -o build/bin/""" + target_binary+		$({pkg-config} --libs sqlite3) \+		$({pkg-config} --libs {gee}) \+		$({pkg-config} --libs gio-2.0) \+		$({pkg-config} --libs cairo) \+		$({pkg-config} --libs glib-2.0) \+		$({pkg-config} --libs gdk-pixbuf-2.0) \+		$({pkg-config} --libs webkit2gtk-4.0) \+		$({pkg-config} --libs xmlbird) \+		$({pkg-config} --libs libnotify) \+		-L./build -L./build/bin -l birdgems \+        -o build/bin/""".format(**config.SETTINGS) + target_binary      birdfont = Builder('birdfont',                           valac_command, @@ -130,50 +121,47 @@ def make_birdfont(target_binary, deps):     yield birdfont.build()  def task_birdfont():-    yield make_birdfont('birdfont', ['libbirdgems.so', 'libbirdfont.so', 'libsvgbird.so'])+    yield make_birdfont('birdfont', ['libbirdgems.so', 'libbirdfont.so'])  def make_birdfont_export(target_binary, deps):-    valac_command = config.VALAC + """ \+    valac_command = """{valac} \         -C \ 		--enable-experimental \         --basedir build/birdfont-export/ \-        """ + config.NON_NULL + """ \-        """ + config.VALACFLAGS.get("birdfont-export", "") + """ \+        {non_null} \+        {valacflags[birdfont-export]} \ 		birdfont-export/*.vala \ 		--vapidir=./ \-		--pkg """ + config.GEE + """ \+		--pkg {gee} \ 		--pkg gio-2.0  \ 		--pkg cairo \ 		--pkg xmlbird \-		--pkg libsvgbird \ 		--pkg libbirdfont \-		--pkg libsvgbird \-        """+        """.format(**config.SETTINGS) -    cc_command = config.CC + " " + config.CFLAGS.get("birdfont-export", "") + """ \+    cc_command = """{cc} {cflags[birdfont-export]} \         -c C_SOURCE \ 		-D 'GETTEXT_PACKAGE="birdfont"' \         -I./build/libbirdfont \-        -I./build/libsvgbird \-		$(pkg-config --cflags sqlite3) \-		$(pkg-config --cflags """ + config.GEE + """) \-		$(pkg-config --cflags gio-2.0) \-		$(pkg-config --cflags cairo) \-		$(pkg-config --cflags glib-2.0) \-        -o OBJECT_FILE"""+		$({pkg-config} --cflags sqlite3) \+		$({pkg-config} --cflags {gee}) \+		$({pkg-config} --cflags gio-2.0) \+		$({pkg-config} --cflags cairo) \+		$({pkg-config} --cflags glib-2.0) \+        -o OBJECT_FILE""".format(**config.SETTINGS)         -    linker_command = config.CC + " " + config.LDFLAGS.get("birdfont-export", "") + """ \+    linker_command = """{cc} {ldflags[birdfont-export]} \ 		build/birdfont-export/*.o \ 		-Lbuild/bin/ -lbirdfont \ 		-lm \-		$(pkg-config --libs sqlite3) \-		$(pkg-config --libs """ + config.GEE + """) \-		$(pkg-config --libs gio-2.0) \-		$(pkg-config --libs cairo) \-		$(pkg-config --libs glib-2.0) \-		$(pkg-config --libs xmlbird) \-		-L./build -L./build/bin -l birdgems -l svgbird \-		-o ./build/bin/""" + target_binary+		$({pkg-config} --libs sqlite3) \+		$({pkg-config} --libs {gee}) \+		$({pkg-config} --libs gio-2.0) \+		$({pkg-config} --libs cairo) \+		$({pkg-config} --libs glib-2.0) \+		$({pkg-config} --libs xmlbird) \+		-L./build -L./build/bin -l birdgems \+		-o ./build/bin/""".format(**config.SETTINGS) + target_binary      birdfont_export = Builder('birdfont-export',                               valac_command, @@ -186,49 +174,47 @@ def make_birdfont_export(target_binary, deps):     yield birdfont_export.build()  def task_birdfont_export():-    yield make_birdfont_export('birdfont-export', ['libbirdgems.so', 'libbirdfont.so', 'libsvgbird.so'])+    yield make_birdfont_export('birdfont-export', ['libbirdgems.so', 'libbirdfont.so'])  def make_birdfont_import(target_binary, deps):-    valac_command = config.VALAC + """\+    valac_command = """{valac} \         -C  \ 		--enable-experimental \         --basedir build/birdfont-import/ \-        """ + config.NON_NULL + """ \-        """ + config.VALACFLAGS.get("birdfont-import", "") + """ \+        {non_null} \+        {valacflags[birdfont-import]} \ 		birdfont-import/*.vala \ 		--vapidir=./ \-		--pkg """ + config.GEE + """ \+		--pkg {gee} \ 		--pkg gio-2.0  \ 		--pkg cairo \ 		--pkg xmlbird \ 		--pkg libbirdfont \-		--pkg libsvgbird \-        """+        """.format(**config.SETTINGS)         -    cc_command = config.CC + " " + config.CFLAGS.get("birdfont-import", "") + """ \+    cc_command = """{cc} {cflags[birdfont-import]} \         -c C_SOURCE \ 		-D 'GETTEXT_PACKAGE="birdfont"' \         -I./build/libbirdfont \-        -I./build/libsvgbird \-		$(pkg-config --cflags sqlite3) \-		$(pkg-config --cflags """ + config.GEE + """) \-		$(pkg-config --cflags gio-2.0) \-		$(pkg-config --cflags cairo) \-		$(pkg-config --cflags glib-2.0) \-        -o OBJECT_FILE"""--    linker_command = config.CC + " " + config.LDFLAGS.get("birdfont-import", "") + """ \+		$({pkg-config} --cflags sqlite3) \+		$({pkg-config} --cflags {gee}) \+		$({pkg-config} --cflags gio-2.0) \+		$({pkg-config} --cflags cairo) \+		$({pkg-config} --cflags glib-2.0) \+        -o OBJECT_FILE""".format(**config.SETTINGS)++    linker_command = """{cc} {ldflags[birdfont-import]} \ 		build/birdfont-import/*.o \ 		-Lbuild/bin/ -lbirdfont \ 		-lm \-		$(pkg-config --libs sqlite3) \-		$(pkg-config --libs """ + config.GEE + """) \-		$(pkg-config --libs gio-2.0) \-		$(pkg-config --libs cairo) \-		$(pkg-config --libs glib-2.0) \-		$(pkg-config --libs xmlbird) \-		-L./build -L./build/bin -l birdgems -l svgbird \-		-o ./build/bin/""" + target_binary+		$({pkg-config} --libs sqlite3) \+		$({pkg-config} --libs {gee}) \+		$({pkg-config} --libs gio-2.0) \+		$({pkg-config} --libs cairo) \+		$({pkg-config} --libs glib-2.0) \+		$({pkg-config} --libs xmlbird) \+		-L./build -L./build/bin -l birdgems \+		-o ./build/bin/""".format(**config.SETTINGS) + target_binary      birdfont_import = Builder('birdfont-import',                           valac_command, @@ -241,51 +227,48 @@ def make_birdfont_import(target_binary, deps):     yield birdfont_import.build()  def task_birdfont_import():-    yield make_birdfont_import('birdfont-import', ['libbirdgems.so', 'libbirdfont.so', 'libsvgbird.so'])+    yield make_birdfont_import('birdfont-import', ['libbirdgems.so', 'libbirdfont.so']) 	 def make_birdfont_autotrace(target_binary, deps):-    valac_command = config.VALAC + """\+    valac_command = """{valac} \         -C \ 		--enable-experimental \         --basedir build/birdfont-autotrace/ \-        """ + config.NON_NULL + """ \-        """ + config.VALACFLAGS.get("birdfont-autotrace", "") + """ \+        {non_null} \+        {valacflags[birdfont-autotrace]} \ 		birdfont-autotrace/*.vala \ 		--vapidir=./ \-		--pkg """ + config.GEE + """ \+		--pkg {gee} \ 		--pkg gio-2.0  \ 		--pkg cairo \ 		--pkg xmlbird \ 		--pkg libbirdfont \-		--pkg libsvgbird \-        """+        """.format(**config.SETTINGS)         -    cc_command = config.CC + " " + config.CFLAGS.get("birdfont-autotrace", "") + """ \+    cc_command = """{cc} {cflags[birdfont-autotrace]} \         -c C_SOURCE \ 		-D 'GETTEXT_PACKAGE="birdfont"' \         -I./build/libbirdfont \-        -I./build/libsvgbird \-		$(pkg-config --cflags sqlite3) \-		$(pkg-config --cflags """ + config.GEE + """) \-		$(pkg-config --cflags gio-2.0) \-		$(pkg-config --cflags cairo) \-		$(pkg-config --cflags glib-2.0) \-        -o OBJECT_FILE"""+		$({pkg-config} --cflags sqlite3) \+		$({pkg-config} --cflags {gee}) \+		$({pkg-config} --cflags gio-2.0) \+		$({pkg-config} --cflags cairo) \+		$({pkg-config} --cflags glib-2.0) \+        -o OBJECT_FILE""".format(**config.SETTINGS)         -    linker_command = config.CC + " " + config.LDFLAGS.get("birdfont-autotrace", "") + """ \+    linker_command = """{cc} {ldflags[birdfont-autotrace]} \ 		build/birdfont-autotrace/*.o \         -I./build/libbirdfont \-        -I./build/libsvgbird \ 		-Lbuild/bin/ -lbirdfont \ 		-lm \-		$(pkg-config --libs sqlite3) \-		$(pkg-config --libs """ + config.GEE + """) \-		$(pkg-config --libs gio-2.0) \-		$(pkg-config --libs cairo) \-		$(pkg-config --libs glib-2.0) \-		$(pkg-config --libs xmlbird) \-		-L./build -L./build/bin -l birdgems -l svgbird\-		-o ./build/bin/""" + target_binary+		$({pkg-config} --libs sqlite3) \+		$({pkg-config} --libs {gee}) \+		$({pkg-config} --libs gio-2.0) \+		$({pkg-config} --libs cairo) \+		$({pkg-config} --libs glib-2.0) \+		$({pkg-config} --libs xmlbird) \+		-L./build -L./build/bin -l birdgems \+		-o ./build/bin/""".format(**config.SETTINGS) + target_binary      birdfont_autotrace = Builder('birdfont-autotrace',                           valac_command, @@ -298,62 +281,60 @@ def make_birdfont_autotrace(target_binary, deps):     yield birdfont_autotrace.build()  def task_birdfont_autotrace():-    yield make_birdfont_autotrace('birdfont-autotrace', ['libbirdgems.so', 'libbirdfont.so', 'libsvgbird.so'])+    yield make_birdfont_autotrace('birdfont-autotrace', ['libbirdgems.so', 'libbirdfont.so'])      def make_libbirdfont(target_binary, deps):-    valac_command = config.VALAC + """\+    valac_command = """{valac} \         -C \         --vapidir=./ \         --basedir build/libbirdfont/ \-        """ + config.NON_NULL + """ \-        """ + config.VALACFLAGS.get("libbirdfont", "") + """ \+        {non_null} \+        {valacflags[libbirdfont]} \         --enable-experimental \         --library libbirdfont \         -H build/libbirdfont/birdfont.h \         libbirdfont/*.vala \         libbirdfont/OpenFontFormat/*.vala \-        libbirdfont/TextRendering/*.vala \+        libbirdfont/Renderer/*.vala \         --pkg posix \-        --pkg """ + config.GEE + """ \+        --pkg {gee} \         --pkg gio-2.0 \         --pkg cairo \         --pkg xmlbird \         --pkg libbirdgems \-        --pkg libsvgbird \         --pkg sqlite3 \         --pkg gdk-pixbuf-2.0 \-        """+        """.format(**config.SETTINGS) -    cc_command = config.CC + " " + config.CFLAGS.get("libbirdfont", "") + """ \+    cc_command = """{cc} {cflags[libbirdfont]} \             -c C_SOURCE \             -fPIC \             -D 'GETTEXT_PACKAGE="birdfont"' \             -I ./build/libbirdfont \             -I ./build/libbirdgems \-            -I ./build/libsvgbird \-            $(pkg-config --cflags sqlite3) \-            $(pkg-config --cflags fontconfig) \-            $(pkg-config --cflags """ + config.GEE + """) \-            $(pkg-config --cflags gio-2.0) \-            $(pkg-config --cflags cairo) \-            $(pkg-config --cflags glib-2.0) \-            $(pkg-config --cflags xmlbird) \-            -o OBJECT_FILE"""--    linker_command = config.CC + " " + config.LDFLAGS.get("libbirdfont", "") + """ \+            $({pkg-config} --cflags sqlite3) \+            $({pkg-config} --cflags fontconfig) \+            $({pkg-config} --cflags {gee}) \+            $({pkg-config} --cflags gio-2.0) \+            $({pkg-config} --cflags cairo) \+            $({pkg-config} --cflags glib-2.0) \+            $({pkg-config} --cflags xmlbird) \+            -o OBJECT_FILE""".format(**config.SETTINGS)++    linker_command = ("""{cc} {ldflags[libbirdfont]} \             -shared \             """ + soname(target_binary) + """ \             build/libbirdfont/*.o \-            $(pkg-config --libs sqlite3) \+            $({pkg-config} --libs sqlite3) \             $(freetype-config --libs) \-            $(pkg-config --libs """ + config.GEE + """) \-            $(pkg-config --libs gio-2.0) \-            $(pkg-config --libs fontconfig) \-            $(pkg-config --libs cairo) \-            $(pkg-config --libs glib-2.0) \-            $(pkg-config --libs xmlbird) \-            -L./build -L./build/bin -l birdgems -l svgbird \-            -o ./build/bin/""" + target_binary+            $({pkg-config} --libs {gee}) \+            $({pkg-config} --libs gio-2.0) \+            $({pkg-config} --libs fontconfig) \+            $({pkg-config} --libs cairo) \+            $({pkg-config} --libs glib-2.0) \+            $({pkg-config} --libs xmlbird) \+            -L./build -L./build/bin -l birdgems \+            -o ./build/bin/""").format(**config.SETTINGS) + target_binary      libbirdfont = Builder('libbirdfont',                           valac_command, @@ -366,94 +347,38 @@ def make_libbirdfont(target_binary, deps):     yield libbirdfont.build()  def task_libbirdfont():-    yield make_libbirdfont('libbirdfont.so.' + SO_VERSION, ['libbirdgems.so', 'libsvgbird.so'])+    yield make_libbirdfont('libbirdfont.so.' + SO_VERSION, ['libbirdgems.so']) -def make_libsvgbird(target_binary, deps):-    valac_command = config.VALAC + """\-        -C \-        --vapidir=./ \-        --basedir build/libsvgbird/ \-        """ + config.NON_NULL + """ \-        """ + config.VALACFLAGS.get("libsvgbird", "") + """ \-        --enable-experimental \-        --library libsvgbird \-        -H build/libsvgbird/svgbird.h \-        libsvgbird/*.vala \-        --pkg posix \-        --pkg """ + config.GEE + """ \-        --pkg gio-2.0 \-        --pkg cairo \-        --pkg xmlbird \-        """ -    cc_command = config.CC + " " + config.CFLAGS.get("libsvgbird", "") + """ \-            -c C_SOURCE \-            -fPIC \-            -I ./build/libsvgbird \-            $(pkg-config --cflags """ + config.GEE + """) \-            $(pkg-config --cflags gio-2.0) \-            $(pkg-config --cflags cairo) \-            $(pkg-config --cflags glib-2.0) \-            $(pkg-config --cflags xmlbird) \-            -o OBJECT_FILE"""--    linker_command = config.CC + " " + config.LDFLAGS.get("libsvgbird", "") + """ \-            -shared \-            """ + soname(target_binary) + """ \-            build/libsvgbird/*.o \-            $(pkg-config --libs """ + config.GEE + """) \-            $(pkg-config --libs gio-2.0) \-            $(pkg-config --libs cairo) \-            $(pkg-config --libs glib-2.0) \-            $(pkg-config --libs xmlbird) \-            -L./build -L./build/bin \-            -o ./build/bin/""" + target_binary--    link_name = 'libsvgbird.so'-    source_directory = 'libsvgbird'-    -    libsvgbird = Builder(source_directory,-                         valac_command, -                         cc_command,-                         linker_command,-                         target_binary,-                         link_name,-                         deps)-			-    yield libsvgbird.build()--def task_libsvgbird():-    yield make_libsvgbird('libsvgbird.so.' + LIBSVGBIRD_SO_VERSION, [])-     def make_libbirdgems(target_binary, deps):-    valac_command = config.VALAC + """\+    valac_command = """{valac} \ 		-C \ 		-H build/libbirdgems/birdgems.h \ 		--pkg posix \ 		--vapidir=./ \ 		--basedir=build/libbirdgems/ \-		""" + config.NON_NULL + """ \-        """ + config.VALACFLAGS.get("libbirdgems", "") + """ \+		{non_null} \+        {valacflags[libbirdgems]} \ 		--enable-experimental \ 		--library libbirdgems \ 		libbirdgems/*.vala \-        """+        """.format(**config.SETTINGS) -    cc_command = config.CC + " " + config.CFLAGS.get("libbirdgems", "") + """ \+    cc_command = """{cc} {cflags[libbirdgems]} \ 			-fPIC \-			$(pkg-config --cflags glib-2.0) \+			$({pkg-config} --cflags glib-2.0) \ 			-c C_SOURCE \             -o OBJECT_FILE \-			"""+			""".format(**config.SETTINGS) -    linker_command = config.CC + " " + config.LDFLAGS.get("libbirdgems", "") + """ \+    linker_command = ("""{cc} {ldflags[libbirdgems]} \ 			-shared \ 			""" + soname(target_binary) + """ \ 			-fPIC \ 			build/libbirdgems/*.o \-			$(pkg-config --libs glib-2.0) \-			$(pkg-config --libs gobject-2.0) \-			-o build/bin/""" + target_binary+			$({pkg-config} --libs glib-2.0) \+			$({pkg-config} --libs gobject-2.0) \+			-o build/bin/""").format(**config.SETTINGS) + target_binary      libbirdgems = Builder('libbirdgems',                           valac_command, @@ -505,46 +430,44 @@ def task_build ():         }  def make_birdfont_test(target_binary, deps):-    valac_command = config.VALAC + """\+    valac_command = """{valac} \         -C \         --vapidir=./ \         --basedir build/birdfont-test/ \-        """ + config.NON_NULL + """ \-        """ + config.VALACFLAGS.get("birdfont-test", "") + """ \+        {non_null} \+        {valacflags[birdfont-test]} \         --enable-experimental \         birdfont-test/*.vala \ 		--vapidir=./ \-		--pkg """ + config.GEE + """ \+		--pkg {gee} \ 		--pkg gio-2.0  \ 		--pkg cairo \ 		--pkg xmlbird \ 		--pkg libbirdfont \-		--pkg libsvgbird \-        """+        """.format(**config.SETTINGS) -    cc_command = config.CC + " " + config.CFLAGS.get("birdfont-test", "") + """ \+    cc_command = """{cc} {cflags[birdfont-test]} \         -c C_SOURCE \ 		-D 'GETTEXT_PACKAGE="birdfont"' \         -I./build/libbirdfont \-        -I./build/libsvgbird \-		$(pkg-config --cflags sqlite3) \-		$(pkg-config --cflags """ + config.GEE + """) \-		$(pkg-config --cflags gio-2.0) \-		$(pkg-config --cflags cairo) \-		$(pkg-config --cflags glib-2.0) \-        -o OBJECT_FILE"""-        -    linker_command = config.CC + " " + config.LDFLAGS.get("birdfont-test", "") + """ \+		$({pkg-config} --cflags sqlite3) \+		$({pkg-config} --cflags {gee}) \+		$({pkg-config} --cflags gio-2.0) \+		$({pkg-config} --cflags cairo) \+		$({pkg-config} --cflags glib-2.0) \+        -o OBJECT_FILE""".format(**config.SETTINGS)++    linker_command = """{cc} {ldflags[birdfont-test]} \         build/birdfont-test/*.o \ 		-L./build/bin -lbirdfont \-		$(pkg-config --libs sqlite3) \-		$(pkg-config --libs """ + config.GEE + """) \-		$(pkg-config --libs gio-2.0) \-		$(pkg-config --libs cairo) \-		$(pkg-config --libs glib-2.0) \-		$(pkg-config --libs xmlbird) \-		-L./build -L./build/bin -l birdgems -l svgbird\-        -o build/bin/""" + target_binary+		$({pkg-config} --libs sqlite3) \+		$({pkg-config} --libs {gee}) \+		$({pkg-config} --libs gio-2.0) \+		$({pkg-config} --libs cairo) \+		$({pkg-config} --libs glib-2.0) \+		$({pkg-config} --libs xmlbird) \+		-L./build -L./build/bin -l birdgems \+        -o build/bin/""".format(**config.SETTINGS) + target_binary      test = Builder('birdfont-test',                    valac_command, @@ -557,57 +480,4 @@ def make_birdfont_test(target_binary, deps):     yield test.build()  def task_birdfont_test():-    yield make_birdfont_test('birdfont-test', ['libbirdgems.so', 'libbirdfont.so'])--def make_birdui(target_binary, deps):-    valac_command = config.VALAC + """\-		-C \-		--pkg posix \-		--pkg """ + config.GEE + """ \-		--pkg gtk+-3.0 \-		--pkg libsvgbird \-		--pkg xmlbird \-		--vapidir=./ \-		--basedir=build/birdui/ \-		""" + config.NON_NULL + """ \-		--enable-experimental \-		birdui/*.vala \-        """--    cc_command = config.CC + """ \-			-fPIC \-			$(pkg-config --cflags gtk+-3.0) \-			$(pkg-config --cflags glib-2.0) \-			$(pkg-config --cflags xmlbird) \-			$(pkg-config --cflags """ + config.GEE + """) \-			-g \-			-I ./build/libsvgbird \-			-c C_SOURCE \-            -o OBJECT_FILE \-			"""--    linker_command = config.CC + """ \-			""" + soname(target_binary) + """ \-			-fPIC \-			-g \-			build/birdui/*.o \-			$(pkg-config --libs gtk+-3.0) \-			$(pkg-config --libs glib-2.0) \-			$(pkg-config --libs gobject-2.0) \-			$(pkg-config --libs xmlbird) \-			$(pkg-config --libs """ + config.GEE + """) \-			-L ./build/bin -l m -l svgbird \-			-o build/bin/""" + target_binary--    libbirdgems = Builder('birdui',-                          valac_command, -                          cc_command,-                          linker_command,-                          target_binary,-						  None,-                          deps)-			-    yield libbirdgems.build()--def task_birdui():-    yield make_birdui('birdui', []) +    yield make_birdfont_test('birdfont-test', ['libbirdgems.so', 'libbirdfont.so'])\ No newline at end of filediff --git a/install.py b/install.pyindex e3e5bc3..f48be4d 100755--- a/install.py+++ b/install.py@@ -1,6 +1,5 @@ #!/usr/bin/python3-"""-Copyright (C) 2013 2014 2015 Johan Mattsson+""" Copyright (C) 2013 2014 2015 Johan Mattsson  This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -107,6 +106,7 @@ install ('resources/linux/birdfont_window_icon.png', '/share/birdfont', 644) install ('resources/linux/birdfont.desktop', '/share/applications', 644) install ('resources/ucd.sqlite', '/share/birdfont', 644) install ('resources/codepages.sqlite', '/share/birdfont', 644)+install ('resources/Roboto-Regular.ttf', '/share/birdfont', 644)  install ('resources/linux/256x256/birdfont.png', '/share/icons/hicolor/256x256/apps', 644) install ('resources/linux/128x128/birdfont.png', '/share/icons/hicolor/128x128/apps', 644)@@ -130,7 +130,8 @@ elif not options.libdir: 	if platform.dist()[0] == 'Ubuntu' or platform.dist()[0] == 'Debian': 		process = subprocess.Popen(['dpkg-architecture', '-qDEB_HOST_MULTIARCH'], stdout=subprocess.PIPE) 		out, err = process.communicate()-		libdir = '/lib/' + out.decode('UTF-8').rstrip ('\n')+		out = out.decode('ascii')+		libdir = '/lib/' + out.rstrip ('\n') 	else: 		p = platform.machine() 		if p == 'i386' or p == 's390' or p == 'ppc' or p == 'armv7hl':diff --git a/libbirdfont/AbstractMenu.vala b/libbirdfont/AbstractMenu.valaindex 19c8e3d..a76c483 100644--- a/libbirdfont/AbstractMenu.vala+++ b/libbirdfont/AbstractMenu.vala@@ -75,7 +75,8 @@ public class AbstractMenu : GLib.Object { 		return null; 	} -	public void process_key_binding_events (uint keyval) {+	/** @return true if the keybindings consumes the event. */+	public bool process_key_binding_events (uint keyval) { 		string display; 		FontDisplay current_display = MainWindow.get_current_display (); 		ToolItem tm;@@ -83,7 +84,7 @@ public class AbstractMenu : GLib.Object { 		 		display = current_display.get_name (); -		if (current_display is Glyph) {+		if (current_display is GlyphTab) { 			display = "Glyph"; 		} 		@@ -96,7 +97,7 @@ public class AbstractMenu : GLib.Object { 					if (!SettingsDisplay.update_key_bindings  						&& !(item is ToolItem)) { 						item.action ();-						return;+						return true; 					} 					 					if (item is ToolItem) {@@ -106,16 +107,18 @@ public class AbstractMenu : GLib.Object { 							if (tm.tool.editor_events) { 								MainWindow.get_toolbox ().set_current_tool (tm.tool); 								tm.tool.select_action (tm.tool);-								return;+								return true; 							} else { 								tm.tool.select_action (tm.tool);								-								return;+								return true; 							} 						} 					} 				} 			} 		}+		+		return false; 	}  	public void load_key_bindings () {@@ -231,6 +234,7 @@ public class AbstractMenu : GLib.Object {  	public void add_tool_key_bindings () { 		ToolItem tool_item;+ 		foreach (ToolCollection tool_set in MainWindow.get_toolbox ().tool_sets) { 			foreach (Expander e in tool_set.get_expanders ()) { 				foreach (Tool t in e.tool) {diff --git a/libbirdfont/AlternateSets.vala b/libbirdfont/AlternateSets.valaindex 871c1a0..637e3f6 100644--- a/libbirdfont/AlternateSets.vala+++ b/libbirdfont/AlternateSets.vala@@ -51,7 +51,30 @@ public class AlternateSets : GLib.Object { 		 		return alt; 	}-	++	public Gee.ArrayList<Alternate> get_alt_with_glyph (string tag, Font font) {	+		Gee.ArrayList<Alternate> alt;+		alt = new Gee.ArrayList<Alternate> ();+		+		foreach (Alternate a in alternates) {+			Alternate available = new Alternate (a.glyph_name, a.tag);+			+			foreach (string substitution in a.alternates) {+				if (font.has_glyph (substitution)) {+					available.alternates.add (substitution);+				}+			}+			+			if (available.tag == tag && available.alternates.size > 0) {+				if (font.has_glyph (available.glyph_name)) {+					alt.add (available);+				}+			}+		}+		+		return alt;+	}+		 	public void remove_empty_sets () { 		int i = 0; 		foreach (Alternate a in alternates) {diff --git a/libbirdfont/BackgroundImage.vala b/libbirdfont/BackgroundImage.valaindex dc62e76..6924ced 100644--- a/libbirdfont/BackgroundImage.vala+++ b/libbirdfont/BackgroundImage.vala@@ -17,7 +17,7 @@ using Math;  namespace BirdFont { 	-public class BackgroundImage {+public class BackgroundImage : GLib.Object { 	 	public string name = ""; 	public Gee.ArrayList<BackgroundSelection> selections;@@ -733,9 +733,13 @@ public class BackgroundImage { 		 		cr.scale (g.view_zoom, g.view_zoom); 		-		if (selected_handle == 2) Theme.color (cr, "Highlighted 1");-		else if (active_handle == 2) Theme.color (cr, "Default Background");-		else Theme.color (cr, "Menu Background");+		if (selected_handle == 2) {+			Theme.color (cr, "Highlighted 1");+		} else if (active_handle == 2) {+			Theme.color (cr, "Default Background");+		} else {+			Theme.color (cr, "Menu Background");+		}  		x = img_offset_x - g.view_offset_x + (size_margin / 2) * img_scale_x; 		y = img_offset_y - g.view_offset_y + (size_margin / 2) * img_scale_y;diff --git a/libbirdfont/BackgroundTab.vala b/libbirdfont/BackgroundTab.valaindex 976cfb9..c154e23 100644--- a/libbirdfont/BackgroundTab.vala+++ b/libbirdfont/BackgroundTab.vala@@ -14,7 +14,6 @@  using Math; using Cairo;-using SvgBird;  namespace BirdFont { diff --git a/libbirdfont/BackgroundTool.vala b/libbirdfont/BackgroundTool.valaindex aae4960..151bd86 100644--- a/libbirdfont/BackgroundTool.vala+++ b/libbirdfont/BackgroundTool.vala@@ -13,6 +13,7 @@ */  using Cairo;+using Math;  namespace BirdFont { @@ -40,8 +41,12 @@ public class BackgroundTool : Tool { 	static BackgroundImage imported_background; 	static ImageSurface imported_surface; 	+	static bool on_axis = false;+	double rotation_position_x = 0;+	double rotation_position_y = 0;+				 	public BackgroundTool (string name) {-		base (name, t_("Move, resize and rotate background image"));+		base (name, ""); 		 		top_limit = 0; 		bottom_limit = 0;@@ -103,7 +108,7 @@ public class BackgroundTool : Tool { 			coordinate_y = Glyph.path_coordinate_y (y); 		 			if (background.selected_handle == 2) {-				background.set_img_rotation_from_coordinate (coordinate_x, coordinate_y);+				background.set_img_rotation_from_coordinate (rotation_position_x, rotation_position_y); 			} 						 			img_offset_x = background.img_offset_x;@@ -111,6 +116,7 @@ public class BackgroundTool : Tool { 			 			background.handler_release (x, y); 			+			on_axis = false; 			move_bg = false; 		}); @@ -135,7 +141,7 @@ public class BackgroundTool : Tool { 					break; 				case Key.RIGHT: 					move (1, 0);-					break;						+					break; 				default: 					break; 			}@@ -152,7 +158,19 @@ public class BackgroundTool : Tool { 			((!) background_image).draw_handle (cairo_context, glyph); 		}); 	}-		++	public override string get_tip () {+		string tip = t_("Move, resize and rotate background image") + "\n";+		tip += HiddenTools.move_along_axis.get_key_binding ();+		tip += " - ";+		tip += t_ ("on axis") + "\n";+		return tip;+	}+	+	public static void move_handle_on_axis () {+		on_axis = true;+	}+	 	void move (int x, int y) { 		Glyph g = MainWindow.get_current_glyph (); 		BackgroundImage? background_image = g.get_background_image ();@@ -176,13 +194,43 @@ public class BackgroundTool : Tool { 		dx *= PenTool.precision; 		dy *= PenTool.precision; +		// rotation handle 		if (bg.selected_handle == 2) { 			coordinate_x = Glyph.path_coordinate_x (x); 			coordinate_y = Glyph.path_coordinate_y (y); 			view_zoom = MainWindow.get_current_glyph ().view_zoom;-			bg.preview_img_rotation_from_coordinate (coordinate_x, coordinate_y, view_zoom);+			+			rotation_position_x = coordinate_x;+			rotation_position_y = coordinate_y;+			+			if (on_axis) {+				double length = fabs (Path.distance (bg.img_middle_x, coordinate_x,+					bg.img_middle_y, coordinate_y));+				+				double min = double.MAX;+				double circle_edge;+				double circle_x;+				double circle_y;+				+				for (double circle_angle = 0; circle_angle < 2 * PI; circle_angle += PI / 4) {+					circle_x = bg.img_middle_x + cos (circle_angle) * length;+					circle_y = bg.img_middle_y + sin (circle_angle) * length;+					+					circle_edge = fabs (Path.distance (coordinate_x, circle_x, +						coordinate_y, circle_y));+					+					if (circle_edge < min) {+						rotation_position_x = circle_x;+						rotation_position_y = circle_y;+						min = circle_edge;+					}+				}+			}+			+			bg.preview_img_rotation_from_coordinate (rotation_position_x, rotation_position_y, view_zoom); 		} 		+		// resize handle 		if (bg.selected_handle == 1) { 			xscale = img_scale_x * ((img_width - dx) / img_width);	 			yscale = xscale;diff --git a/libbirdfont/BackgroundTools.vala b/libbirdfont/BackgroundTools.valaindex 92425b7..f7e7179 100644--- a/libbirdfont/BackgroundTools.vala+++ b/libbirdfont/BackgroundTools.vala@@ -112,7 +112,6 @@ public class BackgroundTools : ToolCollection  { 			add_part (selection); 		} 		-		parts.clear_cache (); 		parts.redraw (); 	} @@ -182,13 +181,13 @@ public class BackgroundTools : ToolCollection  { 		}); 		label.has_delete_button = true; 		parts.add_tool (label, 0);--		parts.redraw ();-		parts.clear_cache ();+		parts.redraw ();		 		 		if (!is_null (MainWindow.get_toolbox ())) {-			MainWindow.get_toolbox ().update_expanders ();-			Toolbox.redraw_tool_box ();+				MainWindow.get_toolbox ().update_expanders ();+				parts.clear_cache ();+				Toolbox.redraw_tool_box ();+				GlyphCanvas.redraw (); 		} 	} diff --git a/libbirdfont/BezierPoints.vala b/libbirdfont/BezierPoints.valanew file mode 100644index 0000000..609f075--- /dev/null+++ b/libbirdfont/BezierPoints.vala@@ -0,0 +1,33 @@+/*+	Copyright (C) 2014 Johan Mattsson++	This library is free software; you can redistribute it and/or modify +	it under the terms of the GNU Lesser General Public License as +	published by the Free Software Foundation; either version 3 of the +	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but +	WITHOUT ANY WARRANTY; without even the implied warranty of +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +	Lesser General Public License for more details.+*/++namespace BirdFont {++/** Bezier point container for the SVG parser. */+public class BezierPoints {+	public unichar type = '\0';+	public unichar svg_type = '\0';+	public double x0  = 0;+	public double y0 = 0;+	public double x1 = 0;+	public double y1 = 0;+	public double x2 = 0;+	public double y2 = 0;+	+	public string to_string () {+		return @"$((!)type.to_string ()) $x0,$y0 $x1,$y1 $x2,$y2 SVG:$((!)svg_type.to_string ())";+	}+}++}diff --git a/libbirdfont/BezierTool.vala b/libbirdfont/BezierTool.valaindex de411f5..a963661 100644--- a/libbirdfont/BezierTool.vala+++ b/libbirdfont/BezierTool.vala@@ -366,21 +366,21 @@ public class BezierTool : Tool { 			GlyphCanvas.redraw (); 		} else if (state == MOVE_HANDLE_ON_AXIS) { 			EditPointHandle h = current_point.get_right_handle ();-			double horizontal, vertical;-			-			vertical = Path.distance (px, h.parent.x, py, py);-			horizontal = Path.distance (h.parent.y, py, py, py);  			current_path.hide_end_handle = false; 			current_point.set_reflective_handles (true); 			current_point.convert_to_curve ();-						-			if (horizontal < vertical) {-				h.move_to_coordinate (px, current_point.y);-			} else {-				h.move_to_coordinate (current_point.x, py);-			}-						+			+			double tied_x = 0;+			double tied_y = 0;+			 +			PointTool.tie_angle (h.parent.x, h.parent.y,+					px, py, out tied_x, out tied_y);+					+			h.x = tied_x;+			h.y = tied_y;+			+			current_path.reset_stroke (); 			GlyphCanvas.redraw (); 		} 		@@ -398,6 +398,8 @@ public class BezierTool : Tool { 		 		if (s > 2) { 			p = current_path.points.get (s - 2);+			p.set_tie_handle (false);+			p.set_reflective_handles (false); 			p.get_right_handle ().convert_to_line (); 			current_point.get_left_handle ().convert_to_line (); 			current_path.recalculate_linear_handles_for_point (p);@@ -442,6 +444,8 @@ public class BezierTool : Tool { 			current_path.delete_last_point (); 			current_path.reset_stroke (); 			current_point = current_path.get_last_point ();+			current_point.set_tie_handle (false);+			current_point.set_reflective_handles (false); 			state = MOVE_HANDLES; 		} else { 			state = swap ? MOVE_LAST_HANDLE_RIGHT : MOVE_LAST_HANDLE_LEFT;diff --git a/libbirdfont/BirdFont.vala b/libbirdfont/BirdFont.valaindex 478bb92..979e0a5 100644--- a/libbirdfont/BirdFont.vala+++ b/libbirdfont/BirdFont.vala@@ -90,6 +90,7 @@ public class BirdFont {  	public static Font current_font; 	public static GlyphCollection current_glyph_collection;+ 	public static Drawing? drawing = null;  	public static string? settings_subdirectory = null;@@ -165,8 +166,6 @@ public class BirdFont { 			Process.exit (0); 		} #endif-		-		CanvasSettings.init (); 		Preferences.load ();  		// always load default theme when names in theme does change@@ -177,7 +176,6 @@ public class BirdFont { 		Theme.set_default_colors ();  		if (theme_version == "" || int.parse (theme_version) < default_theme_version) {- 			Theme.load_theme ("dark.theme"); 			Preferences.set ("theme", "dark.theme"); 		} else {@@ -347,14 +345,17 @@ public class BirdFont { 	}  	public static File get_preview_directory () {-		File settings = get_settings_directory ();-		File backup = get_child(settings, "preview");--		if (!backup.query_exists ()) {-			DirUtils.create ((!) backup.get_path (), 0755);+		string? export = BirdFont.get_current_font ().get_export_directory ();+		+		if (export == null) {+			warning ("No export directory is set.");+			export = ""; 		} -		return backup;+		File e = File.new_for_path ((!) export);+		File p = get_child(e, "preview");+		+		return p; 	}  	public static void set_settings_subdir (string? subdir) {@@ -499,7 +500,13 @@ public string t_ (string t) { #if ANDROID 	return t; #else-	return _(t);+	string translate = Preferences.get ("translate");+	+	if (translate == "" || translate == "true") {+		return _(t);+	} else {+		return t;+	} #endif } diff --git a/libbirdfont/BirdFontFile.vala b/libbirdfont/BirdFontFile.valaindex 30140ea..486b788 100644--- a/libbirdfont/BirdFontFile.vala+++ b/libbirdfont/BirdFontFile.vala@@ -11,9 +11,7 @@ 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU  	Lesser General Public License for more details. */- using B;-using SvgBird;  namespace BirdFont { @@ -277,11 +275,25 @@ class BirdFontFile : GLib.Object { 		foreach (SpacingClass sc in s.classes) { 				os.put_string ("<spacing "); 				os.put_string ("first=\"");-				os.put_string (Font.to_hex (sc.first.get_char ()));+				+				if (sc.first.char_count () == 1) {+					os.put_string (Font.to_hex (sc.first.get_char ()));+				} else {+					os.put_string ("name:");+					os.put_string (XmlParser.encode (sc.first));+				}+				 				os.put_string ("\" "); 				 				os.put_string ("next=\"");-				os.put_string (Font.to_hex (sc.next.get_char ()));+				+				if (sc.next.char_count () == 1) {+					os.put_string (Font.to_hex (sc.next.get_char ()));+				} else {+					os.put_string ("name:");+					os.put_string (XmlParser.encode (sc.next));+				}+				 				os.put_string ("\" "); 				 				os.put_string ("/>\n");@@ -434,7 +446,7 @@ class BirdFontFile : GLib.Object { 	public void write_glyph (Glyph g, DataOutputStream os) throws GLib.Error { 		os.put_string (@"\t<glyph id=\"$(g.version_id)\" left=\"$(double_to_string (g.left_limit))\" right=\"$(double_to_string (g.right_limit))\">\n"); 		-		foreach (Layer layer in g.layers.get_sublayers ()) {+		foreach (Layer layer in g.layers.subgroups) { 			write_layer (layer, os); 		} @@ -442,112 +454,40 @@ class BirdFontFile : GLib.Object { 		os.put_string ("\t</glyph>\n"); 	} -	void write_embedded_svg (EmbeddedSvg svg, DataOutputStream os) throws GLib.Error {-		XmlParser xml = new XmlParser ((!) svg.svg_data);-		-		if (xml.validate ()) {-			os.put_string (@"<embedded ");-			os.put_string (@"type=\"svg\" ");-			os.put_string (@"x=\"$(round (svg.x))\"");-			os.put_string (@"y=\"$(round (svg.y))\"");-			os.put_string (@">\n");-			-			Tag tag = xml.get_root_tag ();-			-			os.put_string ("<");-			os.put_string (tag.get_name ());-			-			os.put_string (" ");-			write_tag_attributes (os, tag);-			-			string content = tag.get_content ();-			-			if (content == "") {-				os.put_string (" /");-			}-			-			os.put_string (">");-	-			os.put_string (content);-			-			os.put_string ("</");-			os.put_string (tag.get_name ());-			os.put_string (">\n");-			-			os.put_string ("</embedded>\n");-		}-	}--	void write_tag_attributes (DataOutputStream os, Tag tag) throws GLib.Error {-		bool first = true;-		-		foreach (Attribute attribute in tag.get_attributes ()) {-			string ns = attribute.get_namespace ();-			-			if (!first) {-				os.put_string (" ");-			}-						-			if (ns != "") {-				os.put_string (ns);-				os.put_string (":");-			}-			-			os.put_string (attribute.get_name ());-			os.put_string ("=");-			os.put_string ("\"");-			os.put_string (attribute.get_content ());-			os.put_string ("\"");-			-			first = false;-		}-	}- 	void write_layer (Layer layer, DataOutputStream os) throws GLib.Error {+		string data;+		+		// FIXME: name etc. 		os.put_string (@"\t\t<layer name= \"$(layer.name)\" visible=\"$(layer.visible)\">\n"); 		-		foreach (SvgBird.Object o in layer.objects.objects) {-			-			if (o is EmbeddedSvg) {-				write_embedded_svg ((EmbeddedSvg) o, os);+		foreach (Path p in layer.get_all_paths ().paths) {+			data = get_point_data (p);+			if (data != "") {+				os.put_string (@"\t\t\t<path ");+				+				if (p.stroke != 0) {+					os.put_string (@"stroke=\"$(double_to_string (p.stroke))\" ");+				}+				+				if (p.line_cap != LineCap.BUTT) {+					if (p.line_cap == LineCap.ROUND) {+						os.put_string (@"cap=\"round\" ");+					} else if (p.line_cap == LineCap.SQUARE) {+						os.put_string (@"cap=\"square\" ");+					}+				}+				+				if (p.skew != 0) {+					os.put_string (@"skew=\"$(double_to_string (p.skew))\" ");+				}+				+				os.put_string (@"data=\"$(data)\" />\n"); 			}-			-			if (o is PathObject) {-				Path p = ((PathObject) o).get_path ();-				write_path_object (p, os);-			}			 		} 		 		os.put_string ("\t\t</layer>\n");	 	} -	void write_path_object (Path p, DataOutputStream os) throws GLib.Error {-		string data;-			-		data = get_point_data (p);-		if (data != "") {-			os.put_string (@"\t\t\t<path ");-			-			if (p.stroke != 0) {-				os.put_string (@"stroke=\"$(double_to_string (p.stroke))\" ");-			}-			-			if (p.line_cap != LineCap.BUTT) {-				if (p.line_cap == LineCap.ROUND) {-					os.put_string (@"cap=\"round\" ");-				} else if (p.line_cap == LineCap.SQUARE) {-					os.put_string (@"cap=\"square\" ");-				}-			}-			-			if (p.skew != 0) {-				os.put_string (@"skew=\"$(double_to_string (p.skew))\" ");-			}-			-			os.put_string (@"data=\"$(data)\" />\n");-		}-	}- 	public static string double_to_string (double n) { 		string d = @"$n"; 		return d.replace (",", ".");@@ -1128,6 +1068,7 @@ class BirdFontFile : GLib.Object { 	 	private void parse_spacing_class (Tag tag) { 		string first, next;+		string name; 		SpacingData spacing = font.get_spacing (); 		 		first = "";@@ -1135,11 +1076,21 @@ class BirdFontFile : GLib.Object { 		 		foreach (Attribute attr in tag.get_attributes ()) { 			if (attr.get_name () == "first") {-				first = (!) Font.to_unichar (attr.get_content ()).to_string ();+				if (attr.get_content ().has_prefix ("U+")) {+					first = (!) Font.to_unichar (attr.get_content ()).to_string ();+				} else if (attr.get_content ().has_prefix ("name:")) {+					name = attr.get_content ().substring ("name:".length);+					first = XmlParser.decode (name);+				} 			}  			if (attr.get_name () == "next") {-				next = (!) Font.to_unichar (attr.get_content ()).to_string ();+				if (attr.get_content ().has_prefix ("U+")) {+					next = (!) Font.to_unichar (attr.get_content ()).to_string ();+				} else if (attr.get_content ().has_prefix ("name:")) {+					name = attr.get_content ().substring ("name:".length);+					next = XmlParser.decode (name);+				} 			}		 		} 		@@ -1157,6 +1108,7 @@ class BirdFontFile : GLib.Object { 			 			foreach (Attribute attr in tag.get_attributes ()) { 				if (attr.get_name () == "left") {+ 					range_left.parse_ranges (unserialize (attr.get_content ())); 				} @@ -1455,7 +1407,7 @@ class BirdFontFile : GLib.Object { 		foreach (Tag t in tag) { 			if (t.get_name () == "background") { 				parse_background_scale (glyph, t);-			}		+			} 		}  		foreach (Path p in glyph.get_all_paths ()) {@@ -1468,33 +1420,6 @@ class BirdFontFile : GLib.Object { 		master.insert_glyph (glyph, selected || selected_id == id); 	} -	void parse_embedded_svg (Layer layer, Tag tag) {-		string type = "";-		double x = 0;-		double y = 0;-		-		foreach (Attribute attribute in tag.get_attributes ()) {-			if (attribute.get_name () == "x") {-				x = parse_double (attribute.get_content ());-			}--			if (attribute.get_name () == "y") {-				y = parse_double (attribute.get_content ());-			}--			if (attribute.get_name () == "type") {-				type = attribute.get_content ();-			}-		}-		-		if (type == "svg") {-			EmbeddedSvg svg = SvgParser.parse_embedded_svg_data (tag.get_content ());-			svg.x = x;-			svg.y = y;-			layer.add_object (svg);-		}-	}- 	Layer parse_layer (Tag tag) { 		Layer layer = new Layer (); 		Path path;@@ -1512,11 +1437,7 @@ class BirdFontFile : GLib.Object { 		foreach (Tag t in tag) { 			if (t.get_name () == "path") { 				path = parse_path (t);-				LayerUtils.add_path (layer, path);-			}-			-			if (t.get_name () == "embedded") {-				parse_embedded_svg (layer, t);+				layer.add_path (path); 			} 		} 		@@ -1551,7 +1472,7 @@ class BirdFontFile : GLib.Object { 			} 		} 		-		return path;+		return path;	 	} 	 	private static void line (Path path, string px, string py) {@@ -1957,7 +1878,6 @@ class BirdFontFile : GLib.Object { 		ligatures = font.get_ligatures (); 		ligatures.add_ligature (sequence, ligature); 	}- }  }diff --git a/libbirdfont/CanvasSettings.vala b/libbirdfont/CanvasSettings.valadeleted file mode 100644index ffa0a6d..0000000--- a/libbirdfont/CanvasSettings.vala+++ /dev/null@@ -1,92 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using B;-using Cairo;--namespace BirdFont {--public class CanvasSettings  {--	public static double stroke_width {-		get {-			settings_mutex.lock ();-			double r = stroke_width_setting;-			-			if (unlikely (stroke_width_setting < 1)) {-				string width = Preferences.get ("stroke_width");-				if (width != "") {-					stroke_width_setting = double.parse (width);-				}-			}-			-			if (stroke_width_setting < 1) {-				stroke_width_setting = 1;-			}-		-			settings_mutex.unlock ();-			return r;-		}-		-		set {-			settings_mutex.lock ();-			stroke_width_setting = value;-			settings_mutex.unlock ();-		}-	}-	-	public static bool show_all_line_handles {-		get {-			settings_mutex.lock ();-			bool r = show_all_line_handles_setting;-			settings_mutex.unlock ();-			return r;-		}-		-		set {-			settings_mutex.lock ();-			show_all_line_handles_setting = value;-			settings_mutex.unlock ();-		}-	}-	-	public static bool fill_open_path {-		get {	-			settings_mutex.lock ();-			bool r = fill_open_path_setting;-			settings_mutex.unlock ();-			return r;-		}-		-		set {-			settings_mutex.lock ();-			fill_open_path_setting = value;-			settings_mutex.unlock ();-		}-	}-	-	static Mutex settings_mutex;--	/** The stroke of an outline when the path is not filled. */-	static double stroke_width_setting = 0;-	static bool show_all_line_handles_setting = true;-	static bool fill_open_path_setting = false;--	public static void init () {-		settings_mutex = new Mutex ();-	}--}--}diff --git a/libbirdfont/CharDatabase.vala b/libbirdfont/CharDatabase.valaindex 3646e5d..5416c13 100644--- a/libbirdfont/CharDatabase.vala+++ b/libbirdfont/CharDatabase.vala@@ -33,7 +33,7 @@ public class CharDatabase { 	 	public static void open_database () { 		File f = get_database_file ();-		int rc = Database.open ((!) f.get_path (), out database);+		int rc = Database.open_v2 ((!) f.get_path (), out database, OPEN_READONLY);  		db = (!) database; diff --git a/libbirdfont/CharDatabaseParser.vala b/libbirdfont/CharDatabaseParser.valaindex 5add4b9..5da463f 100644--- a/libbirdfont/CharDatabaseParser.vala+++ b/libbirdfont/CharDatabaseParser.vala@@ -46,7 +46,7 @@ public class CharDatabaseParser : GLib.Object { 				f.delete (); 			} 			-			open_database ();+			open_database (OPEN_READWRITE); 			create_tables (); 			parse_all_entries (); 		} catch (GLib.Error e) {@@ -54,9 +54,9 @@ public class CharDatabaseParser : GLib.Object { 		} 	} 	-	public void open_database () {+	public void open_database (int access_mode) { 		File f = get_database_file ();-		int rc = Database.open ((!) f.get_path (), out database);+		int rc = Database.open_v2 ((!) f.get_path (), out database, access_mode);  		db = (!) database; diff --git a/libbirdfont/ClipTool.vala b/libbirdfont/ClipTool.valaindex 5f9ab14..4dbbf8b 100644--- a/libbirdfont/ClipTool.vala+++ b/libbirdfont/ClipTool.vala@@ -12,8 +12,6 @@ 	Lesser General Public License for more details. */ -using SvgBird;- namespace BirdFont {  public class ClipTool : Tool {@@ -34,7 +32,7 @@ public class ClipTool : Tool { 		string bf_data; 		string data; 		-		if (fd is Glyph) {+		if (fd is GlyphTab) { 			svg_data = ExportTool.export_selected_paths_to_svg (); 			 			bf_data = export_selected_paths_to_birdfont_clipboard ();@@ -89,7 +87,7 @@ public class ClipTool : Tool { 		double x, y, w, h; 		double dx, dy; 		-		if (fd is Glyph) {+		if (fd is GlyphTab) { 			paste_paths (false); 			 			g.selection_boundaries (out x, out y, out w, out h);@@ -97,7 +95,7 @@ public class ClipTool : Tool { 			dx = g.motion_x - x - w / 2.0; 			dy = g.motion_y - y + h / 2.0; 			-			foreach (SvgBird.Object path in g.active_paths) {+			foreach (Path path in g.active_paths) { 				path.move (dx, dy); 			} 		} else if (fd is KerningDisplay) {@@ -117,7 +115,7 @@ public class ClipTool : Tool { 		// Determine if clipboard contains data in birdfont format. 		is_bf_clipboard = clipboard_data.index_of ("BirdFontClipboard") > -1;  -		if (fd is Glyph) {+		if (fd is GlyphTab) { 			paste_to_glyph (is_bf_clipboard, paste_guide_lines); 		} 		@@ -134,9 +132,10 @@ public class ClipTool : Tool { 		FontDisplay fd = MainWindow.get_current_display (); 		Glyph? destination = null; 		string data;-		return_if_fail (fd is Glyph);+		return_if_fail (fd is GlyphTab); 		-		destination = (Glyph) fd;+		GlyphTab glyph_tab = (GlyphTab) fd; +		destination = glyph_tab.glyphs.get_current (); 		((!)destination).store_undo_state (); 		((!)destination).clear_active_paths (); 		@@ -262,7 +261,7 @@ public class ClipTool : Tool { 					} 				} 			} else if (glyph.get_visible_paths ().size > 0) {-				foreach (Path path in glyph.get_active_paths ()) { // FIXME: other objects+				foreach (Path path in glyph.active_paths) { 					s.append ("BF path: "); 					s.append (BirdFontFile.get_point_data (path)); 					s.append ("\n");@@ -407,9 +406,9 @@ public class ClipTool : Tool { 				string cap = p.replace ("cap: ", ""); 				 				if (cap == "round") {-					path.line_cap = SvgBird.LineCap.ROUND;+					path.line_cap = LineCap.ROUND; 				} else if (cap == "square") {-					path.line_cap = SvgBird.LineCap.SQUARE;+					path.line_cap = LineCap.SQUARE; 				} 			} 		}@@ -449,13 +448,13 @@ public class ClipTool : Tool { 		if (path.points.size > 0) { 			PenTool.clear_directions (); 			glyph.add_path (path);-			glyph.add_active_path (null, path);+			glyph.active_paths.add (path); 			path.update_region_boundaries (); 		} 		 		PenTool.remove_all_selected_points (); 		-		foreach (Path p in glyph.get_active_paths ()) {+		foreach (Path p in glyph.active_paths) { 			if (p.is_open ()) { 				foreach (EditPoint e in p.points) { 					e.set_selected (true);diff --git a/libbirdfont/Color.vala b/libbirdfont/Color.valaindex f930aa1..0924b59 100644--- a/libbirdfont/Color.vala+++ b/libbirdfont/Color.vala@@ -22,19 +22,24 @@  namespace BirdFont { -public class Color : SvgBird.Color {+public class Color {+	public double r;+	public double g;+	public double b;+	public double a;+	 	public Color (double r, double g, double b, double a) {-		base (r, g, b, a);+		this.r = r;+		this.g = g;+		this.b = b;+		this.a = a; 	} -	public Color.create_copy (SvgBird.Color color) {-		base (color.r, color.g, color.b, color.a);-	}-	 	public Color.hsba (double h, double s, double v, double a) { 		double hue, saturation, value; 		double f, p, q, t;-		double r, g, b;++		this.a = a;  		if (s == 0.0) { 			r = v;@@ -95,8 +100,6 @@ public class Color : SvgBird.Color { 				assert_not_reached (); 			} 		}-		-		base (r, g, b, a); 	}  	public void to_hsva (out double h, out double s, out double v, out double a) {@@ -201,10 +204,22 @@ public class Color : SvgBird.Color { 	public static Color magenta () { 		return new Color (103.0 / 255, 33.0 / 255, 120.0 / 255, 1); 	}-		-	public new Color copy () {+	+	public string to_string () {+		return @"r: $r, g: $g, b: $b, a: $a";+	}+	+	public Color copy () { 		return new Color (r, g, b, a); 	}++	public string to_rgb_hex () {+		string s = "#";+		s += Font.to_hex_code ((unichar) Math.rint (r  * 254));+		s += Font.to_hex_code ((unichar) Math.rint (g  * 254));+		s += Font.to_hex_code ((unichar) Math.rint (b  * 254));+		return s;+	} }  }diff --git a/libbirdfont/ColorPicker.vala b/libbirdfont/ColorPicker.valaindex 31188cf..e99493e 100644--- a/libbirdfont/ColorPicker.vala+++ b/libbirdfont/ColorPicker.vala@@ -13,7 +13,6 @@ */  using Cairo;-using SvgBird;  namespace BirdFont { @@ -120,7 +119,7 @@ public class ColorPicker : Tool { 				int g = (int) ((tx / Toolbox.allocation_width) * gradient.stops.size); 				return_if_fail (0 <= g < gradient.stops.size); 				current_stop = gradient.stops.get (g);-				set_color (new Color.create_copy (current_stop.color));+				set_color (current_stop.color); 			} 		} 		@@ -237,7 +236,7 @@ public class ColorPicker : Tool { 			int stop_size = (int) ((double) Toolbox.allocation_width / gradient.stops.size); 			for (int i = 0; i < gradient.stops.size; i++) { 				Stop s = gradient.stops.get (i);-				c = new Color.create_copy (s.color);+				c = s.color; 				cr.save (); 				cr.set_source_rgba (c.r, c.g, c.b, c.a); 				cr.rectangle (i * stop_size, y + 4 * bar_height, stop_size, bar_height);diff --git a/libbirdfont/DrawingTools.vala b/libbirdfont/DrawingTools.valaindex 0ea8a04..ba80cc3 100644--- a/libbirdfont/DrawingTools.vala+++ b/libbirdfont/DrawingTools.vala@@ -14,7 +14,6 @@  using Cairo; using Math;-using SvgBird;  namespace BirdFont { @@ -192,9 +191,9 @@ public class DrawingTools : ToolCollection  { 		});	 		draw_tools.add_tool (move_background); -		move_canvas = new Tool ("move_canvas",-			t_("Move canvas"),-			t_("Press space and click to move the canvas."));+		move_canvas = new Tool ("move_canvas", t_("Move canvas") +			+ "\n" + t_("Ctrl + Shift + Click")+			+ "\n" + t_("Space + Click") + "\n"); 		move_canvas.select_action.connect ((self) => { 			update_drawing_and_background_tools (self); 		});	@@ -241,10 +240,7 @@ public class DrawingTools : ToolCollection  { 		key_tools.add_tool (insert_point_on_path_tool);		 		 		// quadratic Bézier points-		quadratic_points = new Tool ("quadratic_points", -			t_("Create quadratic Bézier curves"),-			t_("All control points will be converted to quadratic points in the TTF format."));-			+		quadratic_points = new Tool ("quadratic_points", t_("Create quadratic Bézier curves")); 		quadratic_points.select_action.connect ((self) => { 			point_type = PointType.QUADRATIC; 			Preferences.set ("point_type", "quadratic_points");@@ -298,7 +294,7 @@ public class DrawingTools : ToolCollection  { 			glyph.selection_boundaries (out x, out y, out w, out h); 			delta = x_coordinate.get_value () - x + glyph.left_limit; 			-			foreach (SvgBird.Object path in glyph.active_paths) {+			foreach (Path path in glyph.active_paths) { 				path.move (delta, 0); 			} 			@@ -341,7 +337,7 @@ public class DrawingTools : ToolCollection  { 			 			glyph.selection_boundaries (out x, out y, out w, out h); 			-			foreach (Path path in glyph.get_active_paths ()) {+			foreach (Path path in glyph.active_paths) { 				path.move (0, y_coordinate.get_value () - (y - h) - font.base_line); 			} 			@@ -381,7 +377,7 @@ public class DrawingTools : ToolCollection  { 			double x, y, w, h; 			Glyph glyph = MainWindow.get_current_glyph (); 			double angle = (self.get_value () / 360) * 2 * PI;-			SvgBird.Object last_path;+			Path last_path; 			glyph.selection_boundaries (out x, out y, out w, out h); 			 			x += w / 2;@@ -486,7 +482,7 @@ public class DrawingTools : ToolCollection  { 				tie = !p.tie_handles; 				 				// don't tie end points-				foreach (Path path in MainWindow.get_current_glyph ().get_active_paths ()) {+				foreach (Path path in MainWindow.get_current_glyph ().active_paths) { 					if (path.is_open ()) { 						if (p == path.get_first_point () || p == path.get_last_point ()) { 							tie = false;@@ -541,7 +537,7 @@ public class DrawingTools : ToolCollection  { 					 					if (!p.path.is_open () || !end_point) { 						p.point.set_reflective_handles (!symmetrical);-						p.point.process_symmetrical_handles ();+						p.point.get_right_handle ().process_symmetrical_handle (); 						 						if (symmetrical) { 							ep.point.set_tie_handle (false);@@ -604,9 +600,9 @@ public class DrawingTools : ToolCollection  { 			Glyph g = MainWindow.get_current_glyph (); 			Layer layer = g.get_current_layer (); 			-			foreach (SvgBird.Object p in g.active_paths) {-				layer.remove (p);-				layer.objects.objects.insert (0, p);+			foreach (Path p in g.active_paths) {+				layer.paths.remove (p);+				layer.paths.paths.insert (0, p); 			} 			 			GlyphCanvas.redraw ();@@ -685,7 +681,7 @@ public class DrawingTools : ToolCollection  { 		});	 		 		bg_selection.select_action.connect((self) => {-			if (MainWindow.get_current_display () is Glyph) {+			if (MainWindow.get_current_display () is GlyphTab) { 				BackgroundTool.import_background_image (); 			} 		});@@ -804,12 +800,12 @@ public class DrawingTools : ToolCollection  { 			g.store_undo_state (); 		 			if (StrokeTool.add_stroke) {-				foreach (SvgBird.Object p in g.active_paths) {+				foreach (Path p in g.active_paths) { 					p.stroke = StrokeTool.stroke_width; 					p.line_cap = StrokeTool.line_cap; 				} 			} else {-				foreach (SvgBird.Object p in g.active_paths) {+				foreach (Path p in g.active_paths) { 					p.stroke = 0; 				}	 			}@@ -844,13 +840,9 @@ public class DrawingTools : ToolCollection  { 			StrokeTool.stroke_width = object_stroke.get_value (); 					 			if (tool && StrokeTool.add_stroke) {-				foreach (SvgBird.Object p in g.active_paths) {+				foreach (Path p in g.active_paths) { 					p.stroke = StrokeTool.stroke_width;-					-					if (p is PathObject) {-						Path path = ((PathObject) p).get_path ();-						path.reset_stroke ();-					}+					p.reset_stroke (); 				} 			} 			@@ -886,15 +878,12 @@ public class DrawingTools : ToolCollection  { 			g = MainWindow.get_current_glyph (); 			g.store_undo_state (); 			-			foreach (SvgBird.Object p in g.active_paths) {-				p.line_cap = SvgBird.LineCap.BUTT;-				-				if (p is PathObject) {-					((PathObject) p).get_path ().reset_stroke ();-				}+			foreach (Path p in g.active_paths) {+				p.line_cap = LineCap.BUTT;+				p.reset_stroke (); 			} 			-			StrokeTool.line_cap = SvgBird.LineCap.BUTT;+			StrokeTool.line_cap = LineCap.BUTT; 			Font f = BirdFont.get_current_font (); 			f.settings.set_setting ("line_cap", @"butt"); @@ -913,15 +902,12 @@ public class DrawingTools : ToolCollection  { 			g = MainWindow.get_current_glyph (); 			g.store_undo_state (); 			-			foreach (SvgBird.Object p in g.active_paths) {-				p.line_cap = SvgBird.LineCap.ROUND;-				-				if (p is PathObject) {-					((PathObject) p).get_path ().reset_stroke ();-				}+			foreach (Path p in g.active_paths) {+				p.line_cap = LineCap.ROUND;+				p.reset_stroke (); 			} 			-			StrokeTool.line_cap = SvgBird.LineCap.ROUND;+			StrokeTool.line_cap = LineCap.ROUND;  			Font f = BirdFont.get_current_font (); 			f.settings.set_setting ("line_cap", @"round");@@ -941,15 +927,12 @@ public class DrawingTools : ToolCollection  { 			g = MainWindow.get_current_glyph (); 			g.store_undo_state (); 			-			foreach (SvgBird.Object p in g.active_paths) {-				p.line_cap = SvgBird.LineCap.SQUARE;--				if (p is PathObject) {-					((PathObject) p).get_path ().reset_stroke ();-				}+			foreach (Path p in g.active_paths) {+				p.line_cap = LineCap.SQUARE;+				p.reset_stroke (); 			} 			-			StrokeTool.line_cap = SvgBird.LineCap.SQUARE;+			StrokeTool.line_cap = LineCap.SQUARE;  			Font f = BirdFont.get_current_font (); 			f.settings.set_setting ("line_cap", @"square");@@ -1105,6 +1088,7 @@ public class DrawingTools : ToolCollection  { 				zoom_tool.store_current_view (); 				glyph_canvas.get_current_display ().reset_zoom (); 				glyph_canvas.redraw_area(0, 0, GlyphCanvas.allocation.width, GlyphCanvas.allocation.height);+				self.set_selected (false); 			}); 		zoombar_tool.add_tool (reset_zoom); 		reset_zoom.set_tool_visibility (false);@@ -1113,6 +1097,7 @@ public class DrawingTools : ToolCollection  { 		full_glyph.select_action.connect((self) => { 			zoom_tool.store_current_view (); 			zoom_tool.zoom_full_glyph ();+			self.set_selected (false); 		}); 		zoombar_tool.add_tool (full_glyph); @@ -1120,6 +1105,7 @@ public class DrawingTools : ToolCollection  { 		zoom_boundaries.select_action.connect((self) => { 			zoom_tool.store_current_view (); 			glyph_canvas.get_current_display ().zoom_max ();+			self.set_selected (false); 		}); 		zoombar_tool.add_tool (zoom_boundaries); @@ -1130,18 +1116,21 @@ public class DrawingTools : ToolCollection  { 				ZoomTool.zoom_full_background_image (); 				glyph_canvas.redraw_area(0, 0, GlyphCanvas.allocation.width, GlyphCanvas.allocation.height); 			}+			self.set_selected (false); 		}); 		zoombar_tool.add_tool (zoom_bg);  		Tool zoom_prev = new Tool ("prev", t_("Previous view")); 		zoom_prev.select_action.connect((self) => { 			zoom_tool.previous_view ();+			self.set_selected (false); 		}); 		zoombar_tool.add_tool (zoom_prev);  		Tool zoom_next = new Tool ("next", t_("Next view")); 		zoom_next.select_action.connect((self) => { 			zoom_tool.next_view ();+			self.set_selected (false); 		}); 		zoombar_tool.add_tool (zoom_next); // view_tools 		zoom_next.set_tool_visibility (false);@@ -1255,9 +1244,11 @@ public class DrawingTools : ToolCollection  { 		// update selelction when the user switches tab 		MainWindow.get_tab_bar ().signal_tab_selected.connect((tab) => { 			Glyph glyph;+			GlyphTab glyph_tab; 			-			if (tab.get_display () is Glyph) {-				glyph = (Glyph) tab.get_display ();+			if (tab.get_display () is GlyphTab) {+				glyph_tab = (GlyphTab) tab.get_display ();+				glyph = glyph_tab.glyphs.get_current (); 				show_bg.set_selected (glyph.get_background_visible ()); 				update_line_selection (glyph); 			}@@ -1268,7 +1259,7 @@ public class DrawingTools : ToolCollection  { 		bool stroke = false; 		Glyph g = MainWindow.get_current_glyph (); 		-		foreach (SvgBird.Object p in g.active_paths) {+		foreach (Path p in g.active_paths) { 			if (p.stroke > 0) { 				stroke = true; 			}@@ -1626,7 +1617,7 @@ public class DrawingTools : ToolCollection  { 		int i = 0; 		 		layer_tools.tool.clear ();-		foreach (Layer layer in g.layers.get_sublayers ()) { +		foreach (Layer layer in g.layers.subgroups) {  			LayerLabel label = new LayerLabel (layer); 			layer_tools.add_tool (label, 0); 			@@ -1660,9 +1651,11 @@ public class DrawingTools : ToolCollection  { 		line_cap_butt.visible = StrokeTool.add_stroke; 		line_cap_round.visible = StrokeTool.add_stroke; 		line_cap_square.visible = StrokeTool.add_stroke;-		MainWindow.get_toolbox ().update_expanders ();+		stroke_expander.clear_cache (); 		stroke_expander.redraw ();+		MainWindow.get_toolbox ().update_expanders (); 	}+ }  }diff --git a/libbirdfont/EditPoint.vala b/libbirdfont/EditPoint.valaindex d5d6be7..f8bcca7 100644--- a/libbirdfont/EditPoint.vala+++ b/libbirdfont/EditPoint.vala@@ -219,6 +219,12 @@ public class EditPoint : GLib.Object { 	/** Make handles symmetrical. */ 	public void set_reflective_handles (bool symmetrical) { 		reflective_point = symmetrical;+		+		if (symmetrical) {+			get_left_handle ().convert_to_curve ();+			get_right_handle ().convert_to_curve ();+			process_tied_handle ();+		} 	}  	/** Flip handles if next point on path is in the other direction. @@ -267,12 +273,6 @@ public class EditPoint : GLib.Object { 		tie_handles = tie; 	} 	-	public void process_symmetrical_handles () {-		process_tied_handle ();-		right_handle.process_symmetrical_handle ();-		left_handle.process_symmetrical_handle ();-	}-	 	public void to_curve () { 		convert_from_line_to_curve (get_right_handle ()); 		convert_from_line_to_curve (get_left_handle ());@@ -294,7 +294,6 @@ public class EditPoint : GLib.Object { 		} 	} -	/** This can only be performed if the path has been closed. */ 	public void process_tied_handle ()  	requires (next != null && prev != null) { 		double a, b, c, length, angle;diff --git a/libbirdfont/EditPointHandle.vala b/libbirdfont/EditPointHandle.valaindex f550122..6425cc2 100644--- a/libbirdfont/EditPointHandle.vala+++ b/libbirdfont/EditPointHandle.vala@@ -48,8 +48,10 @@ public class EditPointHandle : GLib.Object { 			}  			if (parent.reflective_point) {-				parent.process_symmetrical_handles ();-			}	+				process_symmetrical_handle ();+			}+			+			process_connected_handle (); 		} 	} @@ -73,8 +75,10 @@ public class EditPointHandle : GLib.Object { 			}  			if (parent.reflective_point) {-				parent.process_symmetrical_handles ();+				process_symmetrical_handle (); 			}+			+			process_connected_handle (); 		} 	} @@ -289,16 +293,18 @@ public class EditPointHandle : GLib.Object { 			if (!is_left_handle ()) { 				if (parent.next != null) { 					h = parent.get_next ().get_left_handle ();+					h.parent.set_reflective_handles (false); 					h.parent.set_tie_handle (false); 					h.type = PointType.QUADRATIC;-					h.move_to_coordinate_internal (px (), py ());+					h.move_to_coordinate_internal (x, y); 				} 			} else { 				if (parent.prev != null) { 					h = parent.get_prev ().get_right_handle ();+					h.parent.set_reflective_handles (false); 					h.parent.set_tie_handle (false); 					h.type = PointType.QUADRATIC;-					h.move_to_coordinate_internal (px (), py ());+					h.move_to_coordinate_internal (x, y); 				} 			} 		}diff --git a/libbirdfont/EmbeddedSvg.vala b/libbirdfont/EmbeddedSvg.valadeleted file mode 100644index 70b91ec..0000000--- a/libbirdfont/EmbeddedSvg.vala+++ /dev/null@@ -1,114 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using B;-using Math;-using Cairo;-using SvgBird;--namespace BirdFont {--public class EmbeddedSvg : SvgBird.Object {-	public string svg_data = "";-	public SvgDrawing drawing = new SvgDrawing ();-	-	public double x { get; set; }-	public double y { get; set; }--	public override double xmin {-		get {-			return x;-		}-		-		set {-		}-	}--	public override double xmax {-		get {-			return x + drawing.width;-		}--		set {-		}-	}-	--	public override double ymin {-		get {-			return y - drawing.height;-		}--		set {-		}-	}--	public override double ymax {-		get {-			return y;-		}--		set {-		}-	}-			-	public EmbeddedSvg (SvgDrawing drawing) {-		this.drawing = drawing;-	}--	public override void update_region_boundaries () {-		drawing.update_region_boundaries ();-	}--	public override bool is_over (double x, double y) {-		return (this.x <= x <= this.x + drawing.width) -			&& (this.y - drawing.height <= y <= this.y);-	}-	-	public void draw_embedded_svg (Context cr) {-		cr.save ();-		cr.translate (Glyph.xc () + x, Glyph.yc () - y);-		drawing.draw (cr);-		cr.restore ();-	}-	-	public override void draw_outline (Context cr) {-	}-	-	public override SvgBird.Object copy () {-		EmbeddedSvg svg = new EmbeddedSvg (drawing);-		svg.svg_data = svg_data;-		return svg;-	}-	-	public override void move (double dx, double dy) {-		x += dx;-		y += dy;-	}-	-	public override void rotate (double theta, double xc, double yc) {-		drawing.rotate (theta, xc, yc);-	}-	-	public override bool is_empty () {-		return drawing.is_empty ();-	}-	-	public override void resize (double ratio_x, double ratio_y) {-		drawing.resize (ratio_x, ratio_y);-	}--}--}diff --git a/libbirdfont/EmptyTab.vala b/libbirdfont/EmptyTab.valaindex 498260b..ea59ddd 100644--- a/libbirdfont/EmptyTab.vala+++ b/libbirdfont/EmptyTab.vala@@ -40,7 +40,7 @@ public class EmptyTab : FontDisplay { 		cr.rectangle (0, 0, allocation.width, allocation.height); 		cr.fill (); 		cr.restore ();-	}	+	} }  }diff --git a/libbirdfont/Expander.vala b/libbirdfont/Expander.valaindex de72aba..e28e8bc 100644--- a/libbirdfont/Expander.vala+++ b/libbirdfont/Expander.vala@@ -61,10 +61,6 @@ public class Expander : GLib.Object {  	public void clear_cache () { 		cached = null;-		-		foreach (Tool t in tool) {-			t.clear_cache ();-		} 	}  	public void set_headline (Text h) {diff --git a/libbirdfont/ExportSettings.vala b/libbirdfont/ExportSettings.valaindex dee61c6..d246282 100644--- a/libbirdfont/ExportSettings.vala+++ b/libbirdfont/ExportSettings.vala@@ -121,7 +121,7 @@ public class ExportSettings : TableLayout { 		svg.updated.connect ((c) => { 			Font f = BirdFont.get_current_font (); 			string v = c ? "true" : "false";-			f.settings.set_setting ("export_eot", v);+			f.settings.set_setting ("export_svg", v); 		}); 		svg.checked = export_svg_setting (font); 		svg.margin_bottom = margin;diff --git a/libbirdfont/ExportTool.vala b/libbirdfont/ExportTool.valaindex 00b5d14..3de1fab 100644--- a/libbirdfont/ExportTool.vala+++ b/libbirdfont/ExportTool.vala@@ -13,15 +13,38 @@ */  using B;-using SvgBird;  namespace BirdFont {  public class ExportTool : GLib.Object {++	public static string? error_message = null; 	 	public ExportTool (string n) { 	} +	public static void set_output_directory () {+#if MAC+		Font font = BirdFont.get_current_font ();+		string? path = font.get_export_directory ();+			+		FileChooser fc = new FileChooser ();+		fc.file_selected.connect ((p) => {+			 path = p;+		});+		+		if (path == null) {+			File export_path_handle = File.new_for_path (path);+		+			if (!can_write (export_path_handle)) {+				MainWindow.file_chooser (t_("Export"), fc, FileChooser.LOAD | FileChooser.DIRECTORY);+			}+		}+		+		font.export_directory = path;+#endif+	}+ 	public static string export_selected_paths_to_svg () { 		return export_current_glyph_to_string (true);		 	}@@ -45,7 +68,7 @@ public class ExportTool : GLib.Object { <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> <svg version="1.0"  	id="glyph_""" + name + """" -	mlns="http://www.w3.org/2000/svg" +	xmlns="http://www.w3.org/2000/svg"  	xmlns:xlink="http://www.w3.org/1999/xlink" 	x="0px" 	y="0px"@@ -96,50 +119,37 @@ public class ExportTool : GLib.Object { 		 		name = glyph.get_name (); 		-		Gee.ArrayList<SvgBird.Object> pl;+		Gee.ArrayList<Path> pl; 		 		s = new StringBuilder (); 		glyph_svg = ""; -		pl = only_selected_paths ? glyph.active_paths : glyph.get_visible_objects ();-		-		foreach (SvgBird.Object o in pl) {-			-			if (o is PathObject) {-				Path p = ((PathObject) o).get_path ();--				if (p.stroke > 0) {-					s.append (@"<path ");-					s.append (@"style=\"");-					s.append (@"fill:none;");-					s.append (@"stroke:#000000;");-					s.append (@"stroke-width:$(p.stroke)px;");-					-					if (p.line_cap == LineCap.ROUND) {-						s.append (@"stroke-linecap:round;");-					} else if (p.line_cap == LineCap.SQUARE) {-						s.append (@"stroke-linecap:square;");-					}-					-					s.append (@"\" ");-					-					s.append (@"d=\"$(Svg.to_svg_path (p, glyph))\" id=\"path_$(name)_$(id)\" />\n");-					id++;+		pl = only_selected_paths ? glyph.active_paths : glyph.get_visible_paths ();+		foreach (Path p in pl) {+			if (p.stroke > 0) {+				s.append (@"<path ");+				s.append (@"style=\"");+				s.append (@"fill:none;");+				s.append (@"stroke:#000000;");+				s.append (@"stroke-width:$(p.stroke)px;");+				+				if (p.line_cap == LineCap.ROUND) {+					s.append (@"stroke-linecap:round;");+				} else if (p.line_cap == LineCap.SQUARE) {+					s.append (@"stroke-linecap:square;"); 				}-			} else {-				warning ("Copy and paste for other objects not implemented.");+				+				s.append (@"\" ");+				+				s.append (@"d=\"$(Svg.to_svg_path (p, glyph))\" id=\"path_$(name)_$(id)\" />\n");+				id++; 			} 		} 		 		if (only_selected_paths) {-			foreach (SvgBird.Object p in glyph.active_paths) {-				if (p is PathObject) {-					Path path = ((PathObject) p).get_path ();-					if (path.stroke == 0) {-						glyph_svg += Svg.to_svg_path (path, glyph);-					}-				} else {-					warning ("Not implemented");+			foreach (Path p in glyph.active_paths) {+				if (p.stroke == 0) {+					glyph_svg += Svg.to_svg_path (p, glyph); 				} 			}	 		} else {@@ -173,14 +183,14 @@ public class ExportTool : GLib.Object { 			string fn; 			int i; 			-			if (fd is Glyph) {+			if (fd is GlyphTab || fd is Glyph) { 				glyph = MainWindow.get_current_glyph (); 			} else if (fd is OverView) { 				OverView overview = MainWindow.get_overview (); 				Glyph? g = overview.get_selected_glyph (); 				 				if (g == null) {-					warning("No glyhp selected in overview.");+					warning("No glyph selected in overview."); 					return; 				} 				@@ -192,6 +202,7 @@ public class ExportTool : GLib.Object { 			name = glyph.get_name (); 			 			if (selected_file == null) {+				warning ("No selected file."); 				return; 			} 			@@ -212,7 +223,6 @@ public class ExportTool : GLib.Object { 				glyph_svg = export_to_string (glyph, false); 				os = new DataOutputStream (file.create(FileCreateFlags.REPLACE_DESTINATION)); 				os.put_string (glyph_svg);-		 			} catch (Error e) { 				stderr.printf (@"Export \"$svg_file\" \n"); 				critical (@"$(e.message)");@@ -415,11 +425,7 @@ os.put_string (  <div> 	<h3 class="big"></h3>-	<p class="big">-		<span class="capstosmallcaps">OTF</span> features, -		<span class="swashes">like swashes </span>-		<span class="alternates">alternates &amp; </span>-		<span class="smallcaps">small caps</span>, can be added +	<p class="big">OTF features, like swashes alternates &amp; </span> small caps, can be added  		to the font.</span> 	</p> </div>@@ -447,22 +453,31 @@ os.put_string (  	public static string get_export_folder () { 		Font font = BirdFont.get_current_font ();-		string? sandbox = BirdFont.get_sandbox_directory ();+		string? d = font.get_export_directory ();+		+		if (d == null) {+			warning ("No export path is not set");+			return "";+		}+		+		return (!) d;+	} -		if (sandbox != null) {-			File s = File.new_for_path ((!) sandbox);-			File f = get_child (s, "Fonts");-			try {-				if (!f.query_exists ()) {-					f.make_directory ();-				}-			} catch (GLib.Error e) {-				warning(e.message);+	static bool can_write (File folder) {+		File test = get_child (folder, "text.tmp");+		bool writable = false;+		+		try {+			writable = FileUtils.set_contents ((!) test.get_path (), "test");+			+			if (writable) {+				FileUtils.remove ((!) test.get_path ()); 			}-			return (!) get_child (f, font.full_name).get_path ();-		} else {-			return (!) font.get_folder ().get_path ();+		} catch (GLib.Error e) {+			writable = false; 		}+		+		return writable; 	}  	public static File get_export_dir () {@@ -579,16 +594,20 @@ os.put_string ( 		OpenFontFormatWriter fo = new OpenFontFormatWriter (f.units_per_em); 		 		File file = (!) File.new_for_path (ttf);-		File file_mac = (!) File.new_for_path (ttf_mac);+		File file_mac = (!) File.new_for_path (ttf_mac);		++		error_message = null;		 		 		try { 			fo.open (file, file_mac); 			fo.write_ttf_font (f); 			fo.close (); 		} catch (Error e) {-			warning (@"Can't write TTF font to $ttf");+			warning (@"Can't create TTF font to $ttf"); 			critical (@"$(e.message)");-		}+			error_message = e.message;+			f.export_directory = null;+		}		 	} 	 	static void write_eot (string ttf, string eot) {diff --git a/libbirdfont/FileDialogTab.vala b/libbirdfont/FileDialogTab.valaindex 066e035..e52d024 100644--- a/libbirdfont/FileDialogTab.vala+++ b/libbirdfont/FileDialogTab.vala@@ -203,14 +203,11 @@ public class FileDialogTab : Table { 		}  		files.sort ();-		update_rows (); 		 		layout (); 		base.selected_canvas (); 		scroll_to (0);-		 		MainWindow.show_scrollbar ();-		update_scrollbar (); 	}  	public void show_text_area (string text) {@@ -263,8 +260,6 @@ public class FileDialogTab : Table { 				action.file_selected ((!) f.get_path ()); 			} 		}-		-		MainWindow.show_scrollbar (); 	}  	public override string get_label () {@@ -278,7 +273,6 @@ public class FileDialogTab : Table { 	public override void button_release (int button, double ex, double ey) { 		base.button_release (button, ex, ey); 		show_text_area (selected_filename);-		MainWindow.show_scrollbar (); 	} 	 	class SelectedFile : GLib.Object {diff --git a/libbirdfont/Font.vala b/libbirdfont/Font.valaindex a5ca7fe..038fd35 100644--- a/libbirdfont/Font.vala+++ b/libbirdfont/Font.vala@@ -63,6 +63,7 @@ public class Font : GLib.Object { 	public Gee.ArrayList<Line> custom_guides = new Gee.ArrayList<Line> (); 	 	public string? font_file = null;+	public string? export_directory = null; 	 	bool modified = false; 	@@ -187,6 +188,18 @@ public class Font : GLib.Object { 		font_deleted (); 	} +	public string? get_export_directory () {+#if MAC+		return export_directory;+#endif+		return get_folder_path ();+	}++	public void add_default_characters () {+		add_glyph_collection (get_notdef_character ());+		add_glyph_collection (get_space ());+	}+	 	public Alternate? get_alternate (string glyph_name, string tag) { 		Gee.ArrayList<Alternate> alt = alternates.get_alt (tag); 		@@ -322,7 +335,7 @@ public class Font : GLib.Object { 				return fn; 			} else { 				file = File.new_for_path (fn);-				return (!) file.resolve_relative_path ("").get_path ();+				return (!) file.resolve_relative_path (".").get_path (); 			} 		} 		@@ -433,9 +446,16 @@ public class Font : GLib.Object { 	public GlyphCollection get_nonmarking_return () { 		Glyph g; 		GlyphCollection gc;+		GlyphCollection? non_marking; 		 		if (has_glyph ("nonmarkingreturn")) {-			return (!) get_glyph_collection ("nonmarkingreturn");+			non_marking = get_glyph_collection ("nonmarkingreturn");+			+			if (non_marking == null) {+				warning ("Non marking return not created.");+			} else {+				return (!)non_marking;+			} 		} 		 		gc = new GlyphCollection ('\r', "nonmarkingreturn");@@ -457,9 +477,16 @@ public class Font : GLib.Object { 	public GlyphCollection get_null_character () { 		Glyph n; 		GlyphCollection gc;+		GlyphCollection? none;		 		 		if (has_glyph ("null")) {-			return (!) get_glyph_collection ("null");+			none = get_glyph_collection ("null");+			+			if (none == null) {+				warning("Null character not created.");+			} else {+				return (!) none;+			} 		} 		 		gc = new GlyphCollection ('\0', "null");@@ -480,14 +507,19 @@ public class Font : GLib.Object { 	 	public GlyphCollection get_space () { 		Glyph n;-		GlyphCollection gc;+		GlyphCollection gc;		+		GlyphCollection? space = null; 		 		if (has_glyph (" ")) {-			return (!) get_glyph_collection (" ");+			space = get_glyph_collection (" "); 		}  		if (has_glyph ("space")) {-			return (!) get_glyph_collection ("space");+			space = get_glyph_collection ("space");+		}++		if (space != null) {+			return (!) space;			 		} 		 		gc = new GlyphCollection (' ', "space");@@ -506,7 +538,7 @@ public class Font : GLib.Object { 		return gc;		 	} 	-	public GlyphCollection get_not_def_character () {+	public GlyphCollection get_notdef_character () { 		Glyph g; 		GlyphCollection gc; @@ -900,6 +932,7 @@ public class Font : GLib.Object { 		if (loaded) { 			settings.load (get_file_name ()); 			kerning_strings.load (this);+			add_default_characters (); 		} 		 		return loaded;diff --git a/libbirdfont/FontDisplay.vala b/libbirdfont/FontDisplay.valaindex 726913f..b8d5ed7 100644--- a/libbirdfont/FontDisplay.vala+++ b/libbirdfont/FontDisplay.vala@@ -74,7 +74,7 @@ public abstract class FontDisplay : GLib.Object { 	public virtual void double_click (uint button, double ex, double ey) { 	} -  public virtual void magnify (double magnification) {+	public virtual void magnify (double magnification) { 	}  	public virtual void tap_down (int finger, int x, int y) {diff --git a/libbirdfont/Glyph.vala b/libbirdfont/Glyph.valaindex c801013..4caae7a 100644--- a/libbirdfont/Glyph.vala+++ b/libbirdfont/Glyph.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2012 2013 2014 2015 Johan Mattsson+	Copyright (C) 2012 - 2016 Johan Mattsson  	This library is free software; you can redistribute it and/or modify 	it under the terms of the GNU Lesser General Public License as@@ -15,8 +15,6 @@ using Cairo; using Math; using Gee;-using B;-using SvgBird;  namespace BirdFont { @@ -122,7 +120,7 @@ public class Glyph : FontDisplay { 	Line left_line; 	Line right_line; -	/** Cache for Cairo rendering */+	/** Cache for Cairo surface rendering */ 	HashMap<string, Surface> glyph_cache = new HashMap<string, Surface> ();  	public const double CANVAS_MIN = -10000;@@ -133,24 +131,20 @@ public class Glyph : FontDisplay {  	public Layer layers = new Layer (); 	public int current_layer = 0;-	public Gee.ArrayList<SvgBird.Object> active_paths = new Gee.ArrayList<SvgBird.Object> ();+	public Gee.ArrayList<Path> active_paths = new Gee.ArrayList<Path> ();+	public Gee.ArrayList<Layer> selected_groups = new Gee.ArrayList<Layer> (); -	// used if this glyph originates from a fallback font+	// used if this glyph is fetched from a fallback font 	public double top_limit = 0; 	public double baseline = 0; 	public double bottom_limit = 0;  	public Surface? overview_thumbnail = null; -	public double selection_box_width = 0;-	public double selection_box_height = 0;-	public double selection_box_x = 0;-	public double selection_box_y = 0;-	 	public Glyph (string name, unichar unichar_code = 0) { 		this.name = name; 		this.unichar_code = unichar_code;-		+ 		add_help_lines ();  		left_limit = -28;@@ -162,18 +156,18 @@ public class Glyph : FontDisplay { 		this.unichar_code = unichar_code; 	} +	public Gee.ArrayList<Path> get_active_paths () {+		return active_paths;+	}+ 	public Layer get_current_layer () {-		if (unlikely (!(0 <= current_layer < layers.objects.size))) {-			warning ("Layer index out of bounds.");-			return new Layer ();-		}-		-		return layers.get_sublayers ().get (current_layer);+		return_val_if_fail (0 <= current_layer < layers.subgroups.size, new Layer ());+		return layers.subgroups.get (current_layer); 	}  	public void set_current_layer (Layer layer) { 		int i = 0;-		foreach (Layer l in layers.get_sublayers ()) {+		foreach (Layer l in layers.subgroups) { 			if (likely (l == layer)) { 				current_layer = i; 				return;@@ -184,40 +178,27 @@ public class Glyph : FontDisplay { 		warning ("Layer is not added to glyph."); 	} -	public Gee.ArrayList<SvgBird.Object> get_visible_objects () {-		return LayerUtils.get_visible_objects (layers);-	}- 	public Gee.ArrayList<Path> get_visible_paths () {-		return LayerUtils.get_visible_paths (layers).paths;+		return layers.get_visible_paths ().paths; 	}  	public PathList get_visible_path_list () {-		return LayerUtils.get_visible_paths (layers);-	}--	public Gee.ArrayList<SvgBird.Object> get_objects_in_current_layer () {-		return get_current_layer ().objects.objects;+		return layers.get_visible_paths (); 	}  	public Gee.ArrayList<Path> get_paths_in_current_layer () {-		return LayerUtils.get_all_paths (get_current_layer ()).paths;+		return get_current_layer ().get_all_paths ().paths; 	}  	public Gee.ArrayList<Path> get_all_paths () {-		return LayerUtils.get_all_paths (layers).paths;+		return layers.get_all_paths ().paths; 	}  	public void add_new_layer () { 		layers.add_layer (new Layer ());-		current_layer = layers.objects.size - 1;+		current_layer = layers.subgroups.size - 1; 	} -	public void add_layer (Layer layer) {-		layers.add_layer (layer);-		current_layer = layers.objects.size - 1;-	}-	 	public int get_layer_index (Layer layer) { 		return layers.index_of (layer); 	}@@ -257,10 +238,6 @@ public class Glyph : FontDisplay { 	public override void close () { 		undo_list.clear (); 		redo_list.clear ();-		-		foreach (Path path in get_all_paths ()) {-			path.set_editable (false);-		} 	}  	public void set_empty_ttf (bool e) {@@ -272,71 +249,48 @@ public class Glyph : FontDisplay { 	}  	public void clear_active_paths () {+		selected_groups.clear (); 		active_paths.clear (); 	}  	public void add_active_path (Layer? group, Path? p) {-		if (p != null) {-			PathObject path = new PathObject.for_path ((!) p);-			add_active_object (group, path);-		} else {-			add_active_object (group, null);-		}-	}-	-	// FIXME: delete group-	public void add_active_object (Layer? group, SvgBird.Object? o) {-		SvgBird.Object object;+		Path path;+		Layer g; -		if (o != null) {-			object = (!) o;+		if (p != null) {+			path = (!) p; -			if (!active_paths_contains (object)) {-				active_paths.add (object);-			}-			-			if (object is PathObject) {-				PathObject path = (PathObject) object;-				if (Toolbox.get_move_tool ().is_selected ()) {-					if (path.get_path ().stroke > 0) {-						Toolbox.set_object_stroke (path.get_path ().stroke);-					}+			if (Toolbox.get_move_tool ().is_selected ()) {+				if (path.stroke > 0) {+					Toolbox.set_object_stroke (path.stroke); 				}-				-				PenTool.active_path = path.get_path (); 			}-		}-	} -	public bool active_paths_contains (SvgBird.Object object) {-		Glyph glyph = MainWindow.get_current_glyph ();--		if (glyph.active_paths.contains (object)) {-			return true;+			if (!active_paths.contains (path)) {+				active_paths.add (path);+			}+			PenTool.active_path = path; 		}-		-		if (object is PathObject) {-			PathObject path = (PathObject) object;-			-			foreach (SvgBird.Object active in glyph.active_paths) {-				if (active is PathObject) {-					PathObject path_active = (PathObject) active;-					if (path_active.get_path () == path.get_path ()) {-						return true;-					}-				}++		if (group != null) {+			g = (!) group;+			if (!selected_groups.contains (g)) {+				selected_groups.add (g); 			} 		}-		-		return false; 	}-	+ 	public void delete_background () { 		store_undo_state (); 		background_image = null; 		GlyphCanvas.redraw (); 	} +	public Path? get_active_path () {+		return_val_if_fail (active_paths.size > 0, null);+		return active_paths.get (active_paths.size - 1);+	}+ 	public bool boundaries (out double x1, out double y1, out double x2, out double y2) { 		var paths = get_all_paths (); @@ -386,7 +340,7 @@ public class Glyph : FontDisplay { 		px2 = -10000; 		py2 = -10000; -		foreach (SvgBird.Object p in active_paths) {+		foreach (Path p in active_paths) { 			if (p.xmin < px) { 				px = p.xmin; 			}@@ -470,40 +424,21 @@ public class Glyph : FontDisplay { 	public override void scroll_wheel (double x, double y, 		double pixeldelta_x, double pixeldelta_y) { -		if (KeyBindings.has_alt () || KeyBindings.has_ctrl ()) {-			if (pixeldelta_y > 0) {-				zoom_in_at_point (x, y, pixeldelta_y);-			} else {-				zoom_out_at_point (x, y, pixeldelta_y);-			}+		if (pixeldelta_y > 0) {+			zoom_in_at_point (x, y, pixeldelta_y); 		} else {-			if (!KeyBindings.has_shift ()) {-				view_offset_x -= pixeldelta_x / view_zoom;-				view_offset_y -= pixeldelta_y / view_zoom;-			} else {-				// move canvas a long x axis instead of y-				view_offset_x -= pixeldelta_y / view_zoom;-				view_offset_y -= pixeldelta_x / view_zoom;-			}+			zoom_out_at_point (x, y, pixeldelta_y); 		} -		redraw_area (0, 0, allocation.width, allocation.height);+		GlyphCanvas.redraw (); 	}  	public virtual void add_path (Path p) {-		if (layers.objects.size == 0) {-			layers.add_layer (new Layer ());-		}--		LayerUtils.add_path (get_current_layer (), p);-	}--	public void add_object (SvgBird.Object object) {-		if (layers.objects.size == 0) {+		if (layers.subgroups.size == 0) { 			layers.add_layer (new Layer ()); 		} -		get_current_layer ().add_object (object);		+		get_current_layer ().add_path (p); 	}  	public override void selected_canvas () {@@ -528,7 +463,7 @@ public class Glyph : FontDisplay { 		GridTool.update_lines ();  		if (!is_null (MainWindow.native_window)) {-			MainWindow.native_window.set_scrollbar_size (0);+			MainWindow.scrollbar.set_size (0); 		}  		update_zoom_bar ();@@ -539,13 +474,16 @@ public class Glyph : FontDisplay { 		if (index != "") { 			int i = int.parse (index); 			-			if (0 <= i < layers.objects.size) {+			if (0 <= i < layers.subgroups.size) { 				current_layer = i; 			} 		} 		 		DrawingTools.update_layers (); 		MainWindow.get_toolbox ().update_expanders ();++		Tool current_tool = MainWindow.get_toolbox ().get_current_tool ();+		current_tool.select_action (current_tool); 	}  	void update_zoom_bar () {@@ -794,12 +732,8 @@ public class Glyph : FontDisplay { 		} 	} -	public void delete_object (SvgBird.Object o) {-		layers.remove (o);-	}- 	public void delete_path (Path p) {-		LayerUtils.remove_path(layers, p);+		layers.remove_path(p); 	}  	public string get_svg_data () {@@ -949,9 +883,8 @@ public class Glyph : FontDisplay { 			add_path (path); 			path.reopen (); 			path.create_list ();-			-			PathObject object = new PathObject.for_path (path);-			add_active_object (null, object);++			add_active_path (null, path); 		}  		if (remaining_points.paths.size > 0) {@@ -1050,7 +983,9 @@ public class Glyph : FontDisplay { 			return; 		} -		if (move_canvas || DrawingTools.move_canvas.is_selected ()) {+		if (move_canvas +			|| DrawingTools.move_canvas.is_selected ()+			|| (KeyBindings.has_ctrl () && KeyBindings.has_shift ())) { 			view_is_moving = true; 			move_offset_x = view_offset_x; 			move_offset_y = view_offset_y;@@ -1064,7 +999,7 @@ public class Glyph : FontDisplay { 	public void set_active_path (Path p) { 		p.reopen (); 		clear_active_paths ();-		add_active_object (null, new PathObject.for_path (p));+		add_active_path (null, p); 	}  	/** Move view port centrum to this coordinate. */@@ -1134,19 +1069,9 @@ public class Glyph : FontDisplay { 	}  	public void show_zoom_area (int sx, int sy, int nx, int ny) {-		double x, y, w, h;- 		set_zoom_area (sx, sy, nx, ny);- 		zoom_area_is_visible = true;--		x = Math.fmin (zoom_x1, zoom_x2) - 50;-		y = Math.fmin (zoom_y1, zoom_y2) - 50;--		w = Math.fabs (zoom_x1 - zoom_x2) + 100;-		h = Math.fabs (zoom_y1 - zoom_y2) + 100;--		redraw_area ((int)x, (int)y, (int)w, (int)h);+		GlyphCanvas.redraw (); 	}  	public void set_zoom_area (int sx, int sy, int nx, int ny) {@@ -1208,17 +1133,61 @@ public class Glyph : FontDisplay { 		return -y; 	} -	public SvgBird.Object? get_object_at (double x, double y) {-		Layer layer = get_current_layer ();-		for (int i = layer.objects.size - 1; i >= 0; i--) {-			SvgBird.Object o = layer.objects.get_object (i);-			-			if (o.is_over (x, y)) {-				return o;+	public Layer? get_path_at (double x, double y) {+		Layer? group = null;+		bool found = false;++		foreach (Layer layer in get_current_layer ().subgroups) {+			foreach (Path pt in layer.paths.paths) {+				if (pt.is_over (x, y)) {+					found = true;+					group = layer;+				} 			} 		}-		-		return null;++		if (!found) {+			foreach (Path pt in get_paths_in_current_layer ()) {+				if (pt.is_over (x, y)) {+					Layer layer = new Layer ();+					layer.is_counter = true;+					layer.single_path = true;+					layer.add_path (pt);+					group = layer;+				}+			}+		}++		return group;+	}++	public bool select_path (double x, double y) {+		Path? p = null;+		bool found = false;++		foreach (Path pt in get_paths_in_current_layer ()) {+			if (pt.is_over (x, y)) {+				p = pt;+				found = true;+			}+		}++		if (!KeyBindings.has_shift ()) {+			clear_active_paths ();+		}++		add_active_path (null, p);++		return found;+	}++	public bool is_over_selected_path (double x, double y) {+		foreach (Path pt in active_paths) {+			if (pt.is_over (x, y)) {+				return true;+			}+		}+		return false; 	}  	public void queue_redraw_path (Path path) {@@ -1237,6 +1206,48 @@ public class Glyph : FontDisplay { 		redraw_area ((int)xtb - 10, (int)yta - 10, (int)(xtb - xta) + 10, (int) (yta - ytb) + 10); 	} +	public Path get_closeset_path (double x, double y) {+		double d;+		EditPoint ep = new EditPoint ();++		Path min_point = new Path ();+		double min_distance = double.MAX;++		double xt = path_coordinate_x (x);+		double yt = path_coordinate_y (y);+		var paths = get_visible_paths ();++		foreach (Path p in paths) {+			if (p.is_over (xt, yt)) {+				return p;+			}+		}++		foreach (Path p in paths) {+			if (p.points.size == 0) continue;++			p.get_closest_point_on_path (ep, xt, yt);+			d = Math.pow (ep.x - xt, 2) + Math.pow (ep.y - yt, 2);++			if (d < min_distance) {+				min_distance = d;+				min_point = p;+			}++		}++		// a path without any editpoints+		if (paths.size > 0) {+			return paths.get (0);+		}++		if (unlikely (min_distance == double.MAX)) {+			warning (@"No path found in path_list.");+		}++		return min_point;+	}+ 	public void move_selected_edit_point_coordinates (EditPoint selected_point, double xt, double yt) { 		double x, y; @@ -1287,9 +1298,8 @@ public class Glyph : FontDisplay { 			return; 		} -		foreach (SvgBird.Object object in active_paths) {+		foreach (Path path in active_paths) { 			EditPoint p;-			Path path = ((PathObject) object).get_path (); 			EditPoint pl = path.get_last_point ();  			if (pl.prev != null) {@@ -1303,6 +1313,7 @@ public class Glyph : FontDisplay {  				if (px > x) px -= tw + 60; 				if (py > y) py -= th + 60;+ 			} else { 				px = x - 60; 				py = y - 60;@@ -1343,7 +1354,7 @@ public class Glyph : FontDisplay { 	}  	public void open_path () {-		foreach (Path p in get_all_paths ()) {+		foreach (Path p in get_visible_paths ()) { 			p.set_editable (true); 			p.recalculate_linear_handles (); @@ -1588,94 +1599,160 @@ public class Glyph : FontDisplay { 		cr.stroke (); 	} -	public void draw_layers (Context cr) {-		foreach (SvgBird.Object object in layers.objects) {-			if (object is Layer) {-				draw_layer (cr, (Layer) object);-			}-		}+	/** Draw filled paths. */+	public void draw_paths (Context cr, Color? c = null) {+		PathList stroke;+		Color color;+		bool open; 		-		draw_bird_font_paths (cr);-	}+		cr.save ();+		cr.new_path ();+		foreach (Path p in get_visible_paths ()) {+			if (c != null) {+				color = (!) c;+			} else if (p.color != null) {+				color = (!) p.color;+			} else {+				color = Color.black ();+			} -	public void draw_layer (Context cr, Layer sublayers) {-		foreach (SvgBird.Object object in sublayers.objects) {-			if (object is EmbeddedSvg) {-				EmbeddedSvg svg = (EmbeddedSvg) object;-				svg.draw_embedded_svg (cr);+			if (p.stroke > 0) {+				stroke = p.get_stroke_fast ();+				draw_path_list (stroke, cr, color);+			} else {+				open = p.is_open ();+				+				if (open) {+					p.close ();+					p.recalculate_linear_handles ();+				}+				+				p.draw_path (cr, this, color);+				+				if (open) {+					p.reopen ();+				} 			} 		}+		cr.fill ();+		cr.restore (); 	}-		-	public void draw_bird_font_paths (Context cr) {-		Tool selected_tool = MainWindow.get_toolbox ().get_current_tool ();-		-		bool draw_control_points = (selected_tool is PenTool)-			|| (selected_tool is PointTool)-			|| (selected_tool is TrackTool)-			|| (selected_tool is BezierTool); -		bool has_path = false;-		-		if (!draw_control_points) {-			foreach (SvgBird.Object object in get_visible_objects ()) {-				if (object is PathObject-					&& object.stroke > 0) {-						-					has_path = true;-					PathObject object_path = (PathObject) object;				-					object_path.draw_path (cr);+	public void draw_path (Context cr) {+		PathList stroke;+		Color color;++		cr.save ();+		cr.new_path ();+		foreach (Path p in get_visible_paths ()) {+			if (p.stroke > 0) {+				stroke = p.get_stroke_fast ();++				if (p.is_editable ()) {+					color = Theme.get_color ("Filled Stroke");+					color.a = 0.8;+				} else {+					color = Color.black (); 				}++				draw_path_list (stroke, cr, color); 			}+		}+		cr.fill ();+		cr.restore (); -			if (has_path) {-				cr.set_fill_rule (FillRule.WINDING);-				cr.set_source_rgba (0, 0, 0, 1);-				cr.fill ();+		if (!(MainWindow.get_toolbox ().get_current_tool () is PenTool)+			&& !(MainWindow.get_toolbox ().get_current_tool () is PointTool)+			&& !(MainWindow.get_toolbox ().get_current_tool () is TrackTool)+			&& !(MainWindow.get_toolbox ().get_current_tool () is BezierTool)) {+			cr.save ();+			cr.new_path ();+			foreach (Path p in active_paths) {+				if (p.stroke > 0) {+					stroke = p.get_stroke_fast ();+					color = Theme.get_color ("Selected Objects");+					draw_path_list (stroke, cr, color);+				} 			}+			cr.fill ();+			cr.restore (); 		}-		-		has_path = false;-		-		if (!draw_control_points) {-			foreach (SvgBird.Object object in get_visible_objects ()) {-				if (object is PathObject-					&& object.stroke == 0) {-						-					has_path = true;-					PathObject object_path = (PathObject) object;				-					object_path.draw_path (cr);++		if (is_open () && Path.fill_open_path) {+			cr.save ();+			cr.new_path ();+			foreach (Path p in get_visible_paths ()) {+				if (p.stroke == 0) {+					color = p.color == null ? get_path_fill_color () : (!) p.color;+					p.draw_path (cr, this, color); 				} 			}+			cr.fill ();+			cr.restore ();+		} -			if (has_path) {-				cr.set_fill_rule (FillRule.EVEN_ODD);-				Theme.color (cr, "Objects");-				cr.fill ();+		if (is_open ()) {+			cr.save ();+			cr.new_path ();+			foreach (Path p in get_visible_paths ()) {+				p.draw_outline (cr);+				p.draw_edit_points (cr); 			}+			cr.restore (); 		}-		-		if (draw_control_points) {-			foreach (SvgBird.Object object in get_visible_objects ()) {-				if (object is PathObject) {-					PathObject object_path = (PathObject) object;-					Glyph g = MainWindow.get_current_glyph ();-					cr.set_line_width (CanvasSettings.stroke_width / g.view_zoom);-					object_path.path.draw_path (cr);-					object_path.path.draw_control_points (cr);++		if (!is_open ()) {+			// This was good for testing but it is way too slow:+			// Svg.draw_svg_path (cr, get_svg_data (), Glyph.xc () + left, Glyph.yc () - baseline);++			cr.save ();+			cr.new_path ();+			foreach (Path p in get_visible_paths ()) {+				if (p.stroke == 0) {+					color = p.color == null ? Color.black () : (!) p.color;+					p.draw_path (cr, this, color);+				}+			}+			cr.close_path ();+			cr.fill ();+			cr.restore ();++			foreach (Path p in active_paths) {+				cr.save ();+				cr.new_path ();+				if (p.stroke == 0) {+					p.draw_path (cr, this); 				}+				cr.close_path ();+				cr.fill ();+				cr.restore (); 			} 		}  		if (show_orientation_arrow) { 			foreach (Path p in get_visible_paths ()) {-				if (p.stroke == 0) {+				if (p.stroke > 0) {+					stroke = p.get_stroke_fast ();+					foreach (Path ps in stroke.paths) {+						ps.draw_orientation_arrow (cr, orientation_arrow_opacity);+					}+				} else { 					p.draw_orientation_arrow (cr, orientation_arrow_opacity); 				} 			} 		} 	} +	private Color get_path_fill_color () {+		return Theme.get_color ("Fill Color");+	}++	public void draw_path_list (PathList pl, Context cr, Color? c = null) {+		foreach (Path p in pl.paths) {+			p.draw_path (cr, this, c);+		}+	}+ 	public void draw_background_color (Context cr, double opacity) { 		if (opacity > 0) { 			cr.save ();@@ -1712,8 +1789,8 @@ public class Glyph : FontDisplay { 		}  		if (unlikely (Preferences.draw_boundaries)) {-			foreach (SvgBird.Object o in get_visible_objects ()) {-				draw_boundaries (o, cmp);+			foreach (Path p in get_visible_paths ()) {+				p.draw_boundaries (cmp); 			} 		} @@ -1730,29 +1807,22 @@ public class Glyph : FontDisplay { 			cmp.restore (); 		} -		cmp.save ();-		cmp.scale (view_zoom, view_zoom);-		cmp.translate (-view_offset_x, -view_offset_y);-		draw_layers (cmp);-		cmp.restore ();	-		-		Tool selected_tool = MainWindow.get_toolbox ().get_current_tool ();-		bool draw_selection = active_paths.size > 0-			&& (selected_tool is MoveTool || selected_tool is ResizeTool);-		-		if (draw_selection) {-			update_selection_boundaries ();-			draw_selection_box (cmp);+		if (!is_empty ()) {+			cmp.save ();+			cmp.scale (view_zoom, view_zoom);+			cmp.translate (-view_offset_x, -view_offset_y);+			draw_path (cmp);+			cmp.restore (); 		}-		+ 		cmp.save (); 		tool = MainWindow.get_toolbox ().get_current_tool (); 		tool.draw_action (tool, cmp, this); 		cmp.restore (); 	} -	private void zoom_in_at_point (double x, double y, double zoom = 15) {-		int n = (int) (-zoom);+	private void zoom_in_at_point (double x, double y, double amount = 15) {+		int n = (int) (-amount); 		zoom_at_point (x, y, n); 	} @@ -1788,7 +1858,7 @@ public class Glyph : FontDisplay { 	private void move_view_offset (double x, double y) { 		view_offset_x = move_offset_x + (pointer_begin_x - x) * (1/view_zoom); 		view_offset_y = move_offset_y + (pointer_begin_y - y) * (1/view_zoom);-		redraw_area (0, 0, allocation.width, allocation.height);+		GlyphCanvas.redraw (); 	}  	public void store_undo_state (bool clear_redo = false) {@@ -1819,10 +1889,10 @@ public class Glyph : FontDisplay { 			g.add_line (line.copy ()); 		} -		g.layers = (Layer) layers.copy ();+		g.layers = layers.copy (); -		foreach (SvgBird.Object o in active_paths) {-			g.active_paths.add (o);+		foreach (Path p in active_paths) {+			g.active_paths.add (p); 		}  		if (background_image != null) {@@ -1892,7 +1962,7 @@ public class Glyph : FontDisplay {  	void set_glyph_data (Glyph g) { 		current_layer = g.current_layer;-		layers = (Layer) g.layers.copy ();+		layers = g.layers.copy ();  		left_limit = g.left_limit; 		right_limit = g.right_limit;@@ -1909,8 +1979,8 @@ public class Glyph : FontDisplay { 		}  		clear_active_paths ();-		foreach (SvgBird.Object p in g.active_paths) {-			add_active_object (null, p);+		foreach (Path p in g.active_paths) {+			add_active_path (null, p); 		}  		redraw_area (0, 0, allocation.width, allocation.height);@@ -2243,7 +2313,7 @@ public class Glyph : FontDisplay { 		SpacingData sd;  		sd = font.get_spacing ();-		s = sd.get_all_connections ((!) unichar_code.to_string ());+		s = sd.get_all_connections (get_name ());  		foreach (string l in s) { 			if (l != (!) unichar_code.to_string ()) {@@ -2310,12 +2380,12 @@ public class Glyph : FontDisplay { 	public void move_layer_up () { 		Layer layer = get_current_layer (); -		if (current_layer + 2 <= layers.objects.size) {-			return_if_fail (0 <= current_layer + 2 <= layers.objects.size);-			layers.objects.objects.insert (current_layer + 2, layer);+		if (current_layer + 2 <= layers.subgroups.size) {+			return_if_fail (0 <= current_layer + 2 <= layers.subgroups.size);+			layers.subgroups.insert (current_layer + 2, layer); -			return_if_fail (0 <= current_layer + 1 < layers.objects.size);-			layers.objects.objects.remove_at (current_layer);+			return_if_fail (0 <= current_layer + 1 < layers.subgroups.size);+			layers.subgroups.remove_at (current_layer);  			set_current_layer (layer); 		}@@ -2325,11 +2395,11 @@ public class Glyph : FontDisplay { 		Layer layer = get_current_layer ();  		if (current_layer >= 1) {-			return_if_fail (0 <= current_layer - 1 < layers.objects.size);-			layers.objects.objects.insert (current_layer - 1, layer);+			return_if_fail (0 <= current_layer - 1 < layers.subgroups.size);+			layers.subgroups.insert (current_layer - 1, layer); -			return_if_fail (0 <= current_layer + 1 < layers.objects.size);-			layers.objects.objects.remove_at (current_layer + 1);+			return_if_fail (0 <= current_layer + 1 < layers.subgroups.size);+			layers.subgroups.remove_at (current_layer + 1);  			set_current_layer (layer); 		}@@ -2403,138 +2473,6 @@ public class Glyph : FontDisplay { 		 		return g2; 	}-	-	// FIXME: convert everything to the new SvgBird.Object code-	public Gee.ArrayList<Path> get_active_paths () {-		Gee.ArrayList<Path> paths = new Gee.ArrayList<Path> ();-		-		foreach (SvgBird.Object object in active_paths) {-			if (object is PathObject) {-				paths.add (((PathObject) object).get_path ());-			}-		}-		-		return paths;-	}-	-	public void draw_boundaries  (SvgBird.Object object, Context cr) {-		double x = Glyph.reverse_path_coordinate_x (object.xmin); -		double y = Glyph.reverse_path_coordinate_y (object.ymin);-		double x2 = Glyph.reverse_path_coordinate_x (object.xmax);-		double y2 = Glyph.reverse_path_coordinate_y (object.ymax);-		-		cr.save ();-		-		Theme.color (cr, "Default Background");-		cr.set_line_width (2);-		cr.rectangle (x, y, x2 - x, y2 - y);-		cr.stroke ();-		-		cr.restore ();-	}-	-	void draw_selection_box (Context cr) {-		double x, y, w, h;-		double hook_width;-		-		x = reverse_path_coordinate_x (selection_box_x);-		y = reverse_path_coordinate_y (selection_box_y);-		w = selection_box_width / ivz ();-		h = selection_box_height / ivz ();-		-		hook_width = w > 20 ? 10 : w * 0.2;--		update_selection_boundaries ();-		cr.save ();-		-		// FIXME: use color theme-		cr.set_source_rgba (0, 0, 0, 1); -		-		cr.set_line_width (1);-		cr.move_to (x, y + hook_width);-		cr.line_to (x, y);-		cr.line_to (x + hook_width, y);-		cr.stroke ();--		cr.move_to (x + w - hook_width, y);-		cr.line_to (x + w, y);-		cr.line_to (x + w, y + hook_width);-		cr.stroke ();--		cr.move_to (x + w, y + h - hook_width);-		cr.line_to (x + w, y + h);-		cr.line_to (x + w - hook_width, y + h);--		cr.move_to (x + hook_width, y + h);-		cr.line_to (x, y + h);-		cr.line_to (x, y + h - hook_width);-		-		cr.stroke ();					-		cr.restore ();--		cr.save ();-		cr.set_source_rgba (1, 1, 1, 1); -		-		cr.set_line_width (1);-		cr.move_to (x + 1, y + hook_width);-		cr.line_to (x + 1, y + 1);-		cr.line_to (x + hook_width, y + 1);-		cr.stroke ();--		cr.move_to (x + w - hook_width, y + 1);-		cr.line_to (x + w - 1, y + 1);-		cr.line_to (x + w - 1, y + hook_width);-		cr.stroke ();--		cr.move_to (x + w - 1, y + h - hook_width);-		cr.line_to (x + w - 1, y + h - 1);-		cr.line_to (x + w - hook_width, y + h - 1);--		cr.move_to (x + hook_width, y + h - 1);-		cr.line_to (x + 1, y + h - 1);-		cr.line_to (x + 1, y + h - hook_width);-		-		cr.stroke ();					-		cr.restore ();-	}--	public void update_selection_boundaries () {-		get_selection_box_boundaries (out selection_box_x,-			out selection_box_y, out selection_box_width,-			out selection_box_height);	-	}--	public void get_selection_box_boundaries (out double x, out double y, out double w, out double h) {-		double px, py, px2, py2;-		-		px = CANVAS_MAX;-		py = CANVAS_MAX;-		px2 = CANVAS_MIN;-		py2 = CANVAS_MIN;-		-		foreach (Path p in get_active_paths ()) {-			if (px > p.xmin) {-				px = p.xmin;-			} --			if (py > p.ymin) {-				py = p.ymin;-			}--			if (px2 < p.xmax) {-				px2 = p.xmax;-			}-			-			if (py2 < p.ymax) {-				py2 = p.ymax;-			}-		}-		-		w = px2 - px;-		h = py2 - py;-		x = px;-		y = py2;-	} }  }diff --git a/libbirdfont/GlyphCanvas.vala b/libbirdfont/GlyphCanvas.valaindex 3903179..b6fbb40 100644--- a/libbirdfont/GlyphCanvas.vala+++ b/libbirdfont/GlyphCanvas.vala@@ -81,17 +81,18 @@ public class GlyphCanvas : GLib.Object { 	}
 
 	public void redraw_area (int x, int y, int w, int h) {
-		if (unlikely (MenuTab.has_suppress_event ())) {
+		if (MenuTab.has_suppress_event ()) {
 			warning ("Do not call redraw from background thread.");
 		} else {
-			signal_redraw_area (x, y, w, h);
+			signal_redraw_area (x, y, w + (int) MainWindow.scrollbar.width, h);
 		}
 	}
 	
 	public static void redraw () {
 		GlyphCanvas c = MainWindow.get_glyph_canvas ();
-		if (!is_null (c)) {
-			c.redraw_area (0, 0, allocation.width, allocation.height);
+		if (!is_null (c) && !is_null (MainWindow.scrollbar)) {+			int w = (int) (allocation.width + MainWindow.scrollbar.width);
+			c.redraw_area (0, 0, w, allocation.height);
 		}
 	}
 }
diff --git a/libbirdfont/GlyphMaster.vala b/libbirdfont/GlyphMaster.valaindex 6ef100d..16fca24 100644--- a/libbirdfont/GlyphMaster.vala+++ b/libbirdfont/GlyphMaster.vala@@ -115,7 +115,6 @@ public class GlyphMaster : GLib.Object { 		 		foreach (Glyph g in glyphs) { 			n.glyphs.add (g);-			n.glyphs.add (g); 		} 		 		n.selected = selected;diff --git a/libbirdfont/GlyphRange.vala b/libbirdfont/GlyphRange.valaindex 3c8448f..0b26b5b 100644--- a/libbirdfont/GlyphRange.vala+++ b/libbirdfont/GlyphRange.vala@@ -182,7 +182,11 @@ public class GlyphRange { 			} 			 			if (w.char_count () == 1) {-				add_single (w.get_char ());+				unichar c = w.get_char_validated ();+				+				if (c > 0) {+					add_single (c);+				} 			} else if (w == "space") { 				add_single (' '); 			} else if (w == "divis") {@@ -475,9 +479,10 @@ public class GlyphRange { 	} 	 	public unichar get_character (uint32 index) {-		UniRange r;-		unichar c;+		int64 ti; 		string chr;+		UniRange r;+		unichar c;		 		UniRange? range; 		uint32 range_start_index; 		@@ -532,7 +537,9 @@ public class GlyphRange { 		uns = unserialize (c); 		 		if (uns.char_count () != 1) {-			warning (@"Expecting a single character got $c");+			// the glyph was not found by its name because it is not in the list of+			// unassigned characters+			return false;  		} 		 		s = uns.get_char ();diff --git a/libbirdfont/GlyphSelection.vala b/libbirdfont/GlyphSelection.valaindex 4f1e97f..a0f584d 100644--- a/libbirdfont/GlyphSelection.vala+++ b/libbirdfont/GlyphSelection.vala@@ -27,7 +27,7 @@ public class GlyphSelection : OverView { 		FontDisplay.dirty_scrollbar = true;	 		 		open_glyph_signal.connect ((gc) => {-			selected_glyph (gc);+			selected_glyph (gc);			 			Toolbox.redraw_tool_box (); 		}); 		diff --git a/libbirdfont/GlyphSequence.vala b/libbirdfont/GlyphSequence.valaindex 9b08df1..e1637d8 100644--- a/libbirdfont/GlyphSequence.vala+++ b/libbirdfont/GlyphSequence.vala@@ -100,18 +100,9 @@ public class GlyphSequence : GLib.Object {  			foreach (Alternate a in alternates) { 				GlyphSequence old = new GlyphSequence ();-				string name;-				Glyph? g;-				-				name = a.glyph_name;-				-				if (name == "space") {-					name = " ";-				}-				-				g = font.get_glyph_by_name (name);+				Glyph? g = font.get_glyph_by_name (a.glyph_name); -				if (likely (g != null)) {+				if (g != null) { 					old.add (g); 						 					if (a.alternates.size > 0) {@@ -119,7 +110,7 @@ public class GlyphSequence : GLib.Object { 						string alt_name = a.alternates.get (0); 						Glyph? alt = font.get_glyph_by_name (alt_name); 						-						if (likely (alt != null)) {+						if (alt != null) { 							GlyphSequence replacement = new GlyphSequence (); 							replacement.add (alt); 							ligature_sequence.replace (old, replacement);diff --git a/libbirdfont/GlyphTab.vala b/libbirdfont/GlyphTab.valanew file mode 100644index 0000000..ca8972b--- /dev/null+++ b/libbirdfont/GlyphTab.vala@@ -0,0 +1,155 @@+/*+	Copyright (C) 2016 Johan Mattsson++	This library is free software; you can redistribute it and/or modify+	it under the terms of the GNU Lesser General Public License as+	published by the Free Software Foundation; either version 3 of the+	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but+	WITHOUT ANY WARRANTY; without even the implied warranty of+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU+	Lesser General Public License for more details.+*/++using Cairo;+using Math;++namespace BirdFont {++public class GlyphTab : FontDisplay {++	public GlyphCollection glyphs;++	public GlyphTab (GlyphCollection glyphs) {+		this.glyphs = glyphs;+	}++	public override string get_name () {+		return glyphs.get_current ().get_name ();+	}++	public override string get_label () {+		return glyphs.get_current ().get_label ();+	}++	public override void close () {+		glyphs.get_current ().close ();+	}++	public override bool has_scrollbar () {+		return glyphs.get_current ().has_scrollbar ();+	}++	public override void update_scrollbar () {+		glyphs.get_current ().update_scrollbar ();+	}++	public override void scroll_to (double percent) {+		glyphs.get_current ().scroll_to (percent);+	}++	public override void draw (WidgetAllocation allocation, Context cr) {+		glyphs.get_current ().draw (allocation, cr);+	}++	public override void selected_canvas () {+		glyphs.get_current ().selected_canvas ();+	}++	public override void key_press (uint keyval) {+		glyphs.get_current ().key_press (keyval);+	}++	public override void key_release (uint keyval) {+		glyphs.get_current ().key_release (keyval);+	}++	public override void motion_notify (double x, double y) {+		glyphs.get_current ().motion_notify (x, y);+	}++	public override void button_release (int button, double x, double y) {+		glyphs.get_current ().button_release (button, x, y);+	}++	public override void button_press (uint button, double x, double y) {+		glyphs.get_current ().button_press (button, x, y);+	}++	public override void double_click (uint button, double ex, double ey) {+		glyphs.get_current ().double_click (button, ex, ey);	+	}++	public override void magnify (double magnification) {+		glyphs.get_current ().magnify (magnification);+	}++	public override void tap_down (int finger, int x, int y) {+		glyphs.get_current ().tap_down (finger, x, y);+	}++	public override void tap_up (int finger, int x, int y) {+		glyphs.get_current ().tap_up (finger, x, y);+	}++	public override void tap_move (int finger, int x, int y) {+		glyphs.get_current ().tap_move (finger, x, y);+	}++	public override void zoom_in () {+		glyphs.get_current ().zoom_in ();+	}++	public override void zoom_out () {+		glyphs.get_current ().zoom_out ();+	}++	public override void zoom_max () {+		glyphs.get_current ().zoom_max ();+	}++	public override void zoom_min () {+		glyphs.get_current ().zoom_min ();+	}++	public override void move_view (double x, double y) {+		glyphs.get_current ().move_view (x, y);	+	}++	public override void reset_zoom () {+		glyphs.get_current ().reset_zoom ();+	}++	public override void store_current_view () {+		glyphs.get_current ().store_current_view ();+	}++	public override void restore_last_view () {+		glyphs.get_current ().restore_last_view ();+	}++	public override void next_view () {+		glyphs.get_current ().next_view ();+	}++	public override void scroll_wheel (double x, double y,+		double pixeldelta_x,  double pixeldelta_y) {+			glyphs.get_current ().scroll_wheel (x, y, pixeldelta_x, pixeldelta_y);+	}++	public override void undo () {+		glyphs.get_current ().undo ();+	}++	public override void redo () {+		glyphs.get_current ().redo ();+	}++	/** returns false if bindings to a single key works in the display. */+	public override bool needs_modifier () {+		return glyphs.get_current ().needs_modifier ();+	}+}++}diff --git a/libbirdfont/Gradient.vala b/libbirdfont/Gradient.valanew file mode 100644index 0000000..c91e5b9--- /dev/null+++ b/libbirdfont/Gradient.vala@@ -0,0 +1,53 @@+/*+	Copyright (C) 2015 Johan Mattsson++	This library is free software; you can redistribute it and/or modify +	it under the terms of the GNU Lesser General Public License as +	published by the Free Software Foundation; either version 3 of the +	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but +	WITHOUT ANY WARRANTY; without even the implied warranty of +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +	Lesser General Public License for more details.+*/++using Cairo;+using Math;++namespace BirdFont {++public class Gradient : GLib.Object {+	public double x1;+	public double y1;+	public double x2;+	public double y2;++	public Gee.ArrayList<Stop> stops;+	+	public int id = -1;++	public Gradient () {+		x1 = 0;+		y1 = 0;+		x2 = 0;+		y2 = 0;+		stops = new Gee.ArrayList<Stop> ();+	}+	+	public Gradient copy () {+		Gradient g = new Gradient ();+		g.x1 = x1;+		g.y1 = y1;+		g.x2 = x2;+		g.y2 = y2;+		+		foreach (Stop s in stops) {+			g.stops.add (s.copy ());+		}+		+		return g;+	}+}++}diff --git a/libbirdfont/Help.vala b/libbirdfont/Help.valadeleted file mode 100644index 1b49ba2..0000000--- a/libbirdfont/Help.vala+++ /dev/null@@ -1,123 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify-	it under the terms of the GNU Lesser General Public License as-	published by the Free Software Foundation; either version 3 of the-	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but-	WITHOUT ANY WARRANTY; without even the implied warranty of-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU-	Lesser General Public License for more details.-*/--using Cairo;--namespace BirdFont {--public class Help {--	bool visible;-	TextArea help_text;-	Text close;-	const int box_margin = 7;-	-	public Help () {-		string v = Preferences.get ("help_visible");-		visible = v == "true";-		help_text = create_help_text (t_("BirdFont is a font editor."));-		-		Color color = Theme.get_color ("Menu Foreground");-		close = new Text ("close", 30, 0, color);-		close.load_font ("icons.bf");-	}--	public static TextArea create_help_text (string lines) {-		Color color = Theme.get_color ("Menu Foreground");-		TextArea text = new TextArea (17, color);-		text.min_width = 200;-		text.min_height = 100;-		text.width = 200;-		text.height = 100;-		text.allocation = new WidgetAllocation.for_area (0, 0, (int)text.min_width, (int)text.min_height);-		text.set_text (lines);-		text.layout ();-		text.set_editable (false);-		text.draw_border = false;-		return text;-	}--	public void set_help_text (TextArea text) {-		if (text != help_text && is_visible ()) {-			help_text = text;-			GlyphCanvas.redraw ();-		}-	}--	public void set_visible (bool v) {-		visible = v;-		Preferences.set ("help_visible", @"$v");-	}-	-	public bool is_visible () {-		return visible;-	}--	public void draw (Context cr, WidgetAllocation allocation) {-		int margin_x = 10;-		int margin_y = 15;--		help_text.allocation = allocation;-		help_text.widget_x = allocation.width - help_text.width - margin_x;-		help_text.widget_y = allocation.height - help_text.height - margin_y;-		-		draw_box (cr, allocation);-		-		help_text.draw (cr);--		double close_x = allocation.width;-		close_x -= close.get_sidebearing_extent ();-		close_x -= margin_x;-		close_x -= box_margin;-		-		double close_y = allocation.height;-		close_y -= help_text.height;-		close_y -= margin_y;-		close_y -= 2 * box_margin;-		-		close.widget_x = close_x;-		close.widget_y = close_y;-		close.draw (cr);-	}--	public bool button_press (uint button, double x, double y) {-		if (close.widget_x < x < close.widget_x + close.get_sidebearing_extent ()-			&& close.widget_y < y < close.widget_y + close.font_size) {-			-			set_visible (false);-			GlyphCanvas.redraw ();-			return true;-		}-		-		return false;-	}--	public void draw_box (Context cr, WidgetAllocation allocation) {-		cr.save();--		Theme.color (cr, "Menu Background");-		double x, y, w, h;-		x = help_text.widget_x - 2 * box_margin;-		y = help_text.widget_y - 2 * box_margin; -		w = help_text.width + 2 * box_margin;-		h = help_text.height + 2 * box_margin;-		Widget.draw_rounded_rectangle (cr, x, y, w, h, 7);-		cr.fill ();--		cr.restore();-	}--}--}diff --git a/libbirdfont/HiddenTools.vala b/libbirdfont/HiddenTools.valaindex dc45c98..8d40be5 100644--- a/libbirdfont/HiddenTools.vala+++ b/libbirdfont/HiddenTools.vala@@ -67,6 +67,8 @@ public class HiddenTools : ToolCollection  { 				DrawingTools.bezier_tool.move_handle_on_axis (); 			} else if (t is PenTool || t is PointTool) { 				PenTool.move_handle_on_axis ();+			} else if (t is BackgroundTool) {+				BackgroundTool.move_handle_on_axis (); 			} 		}); 		move_along_axis.is_tool_modifier = true;diff --git a/libbirdfont/ImportUtils.vala b/libbirdfont/ImportUtils.valaindex 18939a0..3b47709 100644--- a/libbirdfont/ImportUtils.vala+++ b/libbirdfont/ImportUtils.vala@@ -34,7 +34,6 @@ public static int run_import (string[] arg) { 	BirdFont.current_font = new Font (); 	BirdFont.current_glyph_collection = new GlyphCollection.with_glyph ('\0', ""); 	MainWindow.init ();-	SvgType type = SvgType.REGULAR;  	if (arg.length < 3) { 		print_import_help (arg);@@ -44,11 +43,7 @@ public static int run_import (string[] arg) { 	bf_file = build_absoulute_path (arg[1]); 	 	for (int i = 2; i < arg.length; i++) {-		if (arg[i] == "--color") {-			type = SvgType.COLOR;-		} else {-			svg_files.add (arg[i]);-		}+		svg_files.add (arg[i]); 	} 	 	bf = File.new_for_path (bf_file);@@ -84,7 +79,7 @@ public static int run_import (string[] arg) {  	foreach (string f in svg_files) { 		svg = File.new_for_path (f);-		imported = import_svg_file (font, svg, type);+		imported = import_svg_file (font, svg); 		 		if (!imported) { 			stdout.printf (t_("Failed to import") + " " + f + "\n");@@ -98,7 +93,7 @@ public static int run_import (string[] arg) { 	return 0; } -public static bool import_svg_file (Font font, File svg_file, SvgType type) {+public static bool import_svg_file (Font font, File svg_file) { 	string file_name = (!) svg_file.get_basename (); 	string glyph_name; 	StringBuilder n;@@ -163,11 +158,7 @@ public static bool import_svg_file (Font font, File svg_file, SvgType type) { 	stdout.printf (@"$(glyph.version_id)"); 	stdout.printf ("\n"); 	-	if (type == SvgType.COLOR) {-		SvgParser.import_color_svg (glyph, (!) svg_file.get_path ());-	} else {-		SvgParser.import_svg ((!) svg_file.get_path ());-	}+	SvgParser.import_svg ((!) svg_file.get_path ()); 	 	return true; }diff --git a/libbirdfont/KerningClasses.vala b/libbirdfont/KerningClasses.valaindex 4198a8c..77f257d 100644--- a/libbirdfont/KerningClasses.vala+++ b/libbirdfont/KerningClasses.vala@@ -80,6 +80,27 @@ public class KerningClasses : GLib.Object { 		} 	} +	/** Copy kerning pairs for newly created spacing classes. */+	public void copy_single_kerning_pairs (string from_spacing_class, string to_spacing_class) {+		double? kerning;+		+		foreach (string left in single_kerning_letters_left) {	+			kerning = get_kerning_for_single_glyphs (left, from_spacing_class);+			+			if (kerning != null) {+				set_kerning_for_single_glyphs (left, to_spacing_class, (!) kerning);+			}+		}++		foreach (string right in single_kerning_letters_right) {	+			kerning = get_kerning_for_single_glyphs (from_spacing_class, right);+			+			if (kerning != null) {+				set_kerning_for_single_glyphs (to_spacing_class, right, (!) kerning);+			}+		}		+	}+ 	/** Class based gpos kerning. */ 	public double get_kerning_for_pair (string a, string b, GlyphRange? gr_left, GlyphRange? gr_right) { 		double k = 0;@@ -127,34 +148,19 @@ public class KerningClasses : GLib.Object { 		return 0; 	} -	public void update_space_class (string c) {-		double? k;-		-		foreach (string l in single_kerning_letters_left) {	-			k = get_kerning_for_single_glyphs (l, c);-			-			if (k != null) {-				set_kerning_for_single_glyphs (l, c, (!) k);-			}-		}--		foreach (string r in single_kerning_letters_right) {	-			k = get_kerning_for_single_glyphs (c, r);-			-			if (k != null) {-				set_kerning_for_single_glyphs (c, r, (!) k);-			}-		}		-	}- 	public double? get_kerning_for_single_glyphs (string first, string next) { 		double? k = null;+		double? kerning = null; 		string left = GlyphRange.serialize (first); 		string right = GlyphRange.serialize (next);  		foreach (string l in get_spacing_class (left)) { 			foreach (string r in get_spacing_class (right)) {-				k = single_kerning.get (@"$l - $r");+				kerning = single_kerning.get (@"$l - $r");+				+				if (kerning != null) {+					k = kerning;+				}				 			} 		} 		diff --git a/libbirdfont/KerningDisplay.vala b/libbirdfont/KerningDisplay.valaindex 325f811..89c0f87 100644--- a/libbirdfont/KerningDisplay.vala+++ b/libbirdfont/KerningDisplay.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2012 2014 2015 2016 Johan Mattsson+	Copyright (C) 2012 2014 2015 Johan Mattsson  	This library is free software; you can redistribute it and/or modify  	it under the terms of the GNU Lesser General Public License as @@ -45,8 +45,10 @@ public class KerningDisplay : FontDisplay { 	 	public bool adjust_side_bearings = false; 	public bool right_side_bearing = true;++	public static bool right_to_left = false; 	 	-	TextArea description; +	WidgetAllocation allocation = new WidgetAllocation (); 	 	public KerningDisplay () { 		GlyphSequence w = new GlyphSequence ();@@ -56,8 +58,6 @@ public class KerningDisplay : FontDisplay { 		redo_items = new Gee.ArrayList <UndoItem> (); 		w.set_otf_tags (KerningTools.get_otf_tags ()); 		first_row.add (w);-		-		description = Help.create_help_text (t_("Kerning is the process of adjusting the space between two letters. You can cahnge the space between one letter and all other letters in the spacing tab.")); 	}  	public GlyphSequence get_first_row () {@@ -137,6 +137,8 @@ public class KerningDisplay : FontDisplay { 		double item_size = 1.0 / KerningTools.font_size; 		double item_size2 = 2.0 / KerningTools.font_size; +		this.allocation = allocation;+ 		i = 0; 		 		// bg color@@ -154,12 +156,16 @@ public class KerningDisplay : FontDisplay { 		row_height = get_row_height (); 	 		alpha = 1;-		y = get_row_height () + font.base_line + 20;+		y = get_row_height () - font.base_line + 20; 		x = 20; 		w = 0; 		prev = null; 		kern = 0; 		+		if (right_to_left) {+			x = (allocation.width - 20) / KerningTools.font_size;+		}+				 		foreach (GlyphSequence word in get_all_rows ()) { 			wi = 0; 			word_with_ligatures = word.process_ligatures (font);@@ -192,8 +198,14 @@ public class KerningDisplay : FontDisplay {  					cr.save (); 					glyph.add_help_lines ();-					cr.translate (kern + x - glyph.get_lsb () - Glyph.xc (), glyph.get_baseline () + y  - Glyph.yc ());-					glyph.draw_layers (cr);++					if (right_to_left) {+						cr.translate (-kern + x - glyph.get_lsb () - glyph.get_width () - Glyph.xc (), glyph.get_baseline () + y  - Glyph.yc ());+					} else {						+						cr.translate (kern + x - glyph.get_lsb () - Glyph.xc (), glyph.get_baseline () + y  - Glyph.yc ());+					}+					+					glyph.draw_paths (cr); 					cr.restore (); 					 					w = glyph.get_width ();@@ -201,7 +213,11 @@ public class KerningDisplay : FontDisplay { 				 				// handle 				if (first_row && (active_handle == i || selected_handle == i)) {-					x2 = x + kern / 2.0;+					if (right_to_left) {+						x2 = x - kern / 2.0;+					} else {+						x2 = x + kern / 2.0;+					} 					 					cr.save (); 					@@ -251,7 +267,11 @@ public class KerningDisplay : FontDisplay { 					cr.restore (); 				}	 				-				x += w + kern;+				if (right_to_left) {+					x -= w + kern;+				} else {+					x += w + kern;+				} 	 				// caption 				if (g == null || ((!)g).is_empty ()) {@@ -272,7 +292,7 @@ public class KerningDisplay : FontDisplay { 			// draw caret 			if (first_row) { 				x2 = x;-				caret_y = get_row_height () + font.base_line + 20;+				caret_y = get_row_height () - font.base_line + 20; 				cr.save (); 				cr.set_line_width (1.0 / KerningTools.font_size); 				Theme.color_opacity (cr, "Foreground 1", 0.5);@@ -285,7 +305,13 @@ public class KerningDisplay : FontDisplay { 			} 						 			y += row_height + 20;-			x = 20;+			+			if (right_to_left) {+				x = (allocation.width - 20) / KerningTools.font_size;+			} else {				+				x = 20;+			}+ 			first_row = false; 			 			if (y > allocation.height) {@@ -492,7 +518,6 @@ public class KerningDisplay : FontDisplay { 	 	public override void selected_canvas () { 		KeyBindings.set_require_modifier (true);-		MainWindow.get_help ().set_help_text (description); 	} 	 	public void add_kerning_class (int index) {@@ -577,6 +602,8 @@ public class KerningDisplay : FontDisplay { 			kd = (KerningDisplay) fd; 			kd.set_selected_handle (kd.selected_handle - 1);	 		}+		+		GlyphCanvas.redraw (); 	} 	 	public static void next_pair () {@@ -588,6 +615,7 @@ public class KerningDisplay : FontDisplay { 		 		if (fd is SpacingTab) { 			st = (SpacingTab) fd;+	 			if (st.right_side_bearing) { 				st.right_side_bearing = false; 			} else {@@ -598,6 +626,8 @@ public class KerningDisplay : FontDisplay { 			kd = (KerningDisplay) fd; 			kd.set_selected_handle (kd.selected_handle + 1);	 		}+		+		GlyphCanvas.redraw (); 	}  	private static string round (double d) {@@ -772,6 +802,11 @@ public class KerningDisplay : FontDisplay { 			 			k = (ex - last_handle_x) / y; // y-axis is for variable precision 			k /= KerningTools.font_size;++			if (right_to_left) {+				k *= -1;+			}			+			 			set_space (selected_handle, k); 			GlyphCanvas.redraw (); 		}@@ -789,7 +824,11 @@ public class KerningDisplay : FontDisplay { 		Glyph glyph = new Glyph.no_lines (""); 		double fs = KerningTools.font_size; 		double x = 20;-				++		if (right_to_left) {+			x = (allocation.width - 20) / KerningTools.font_size;+		}		+			 		GlyphRange? gr_left, gr_right; 		 		Glyph? prev = null;@@ -825,8 +864,12 @@ public class KerningDisplay : FontDisplay {  				kern = get_kerning_for_pair (((!)prev).get_name (), ((!)g).get_name (), gr_left, gr_right); 			}-							-			d = Math.pow (fs * (x + kern) - ex, 2);+			+			if (right_to_left) {+				d = Math.pow (fs * (x - kern) - ex, 2);+			} else {				+				d = Math.pow (fs * (x + kern) - ex, 2);+			} 			 			if (d < min) { 				min = d;@@ -848,7 +891,13 @@ public class KerningDisplay : FontDisplay { 			} 			 			prev = g;-			x += w + kern;+			+			if (right_to_left) {+				x -= w + kern;+			} else {+				x += w + kern;+			}+			 			i++; 			col_index++; 		}diff --git a/libbirdfont/KerningRange.vala b/libbirdfont/KerningRange.valaindex 2256261..806e8e4 100644--- a/libbirdfont/KerningRange.vala+++ b/libbirdfont/KerningRange.vala@@ -113,7 +113,8 @@ public class KerningRange : Tool { 		TextListener listener = new TextListener (t_("Kerning class"), ranges, t_("Set")); 		listener.signal_text_input.connect ((text) => { 			set_ranges (text);-			Toolbox.redraw_tool_box ();+			KerningTools.classes.clear_cache ();+			KerningTools.classes.redraw (); 		}); 		 		listener.signal_submit.connect (() => {diff --git a/libbirdfont/KerningTools.vala b/libbirdfont/KerningTools.valaindex 494a0e7..8b996ce 100644--- a/libbirdfont/KerningTools.vala+++ b/libbirdfont/KerningTools.vala@@ -54,7 +54,12 @@ public class KerningTools : ToolCollection  { 		active_otf_features = new OtfTags (); 		 		Expander kerning_tools = new Expander (t_("Kerning Tools"));-		classes = new Expander ();+		+		if (is_null (classes)) {+			classes = new Expander ();+			update_kerning_classes ();+		}+		 		expanders = new Gee.ArrayList<Expander> ();  		Expander font_name = new Expander ();@@ -86,6 +91,7 @@ public class KerningTools : ToolCollection  { 			KerningRange kr = new KerningRange (f, @"$label $(++next_class)"); 			classes.add_tool (kr); 			self.set_selected (false);+			classes.clear_cache (); 			classes.redraw (); 		}); 		kerning_tools.add_tool (new_kerning_class);@@ -121,6 +127,15 @@ public class KerningTools : ToolCollection  { 		}); 		kerning_tools.add_tool (insert_unicode); +		Tool right_to_left = new Tool ("right_to_left", t_("Right to left"));+		right_to_left.select_action.connect ((self) => {+			KerningDisplay d = MainWindow.get_kerning_display ();+			d.right_to_left = !d.right_to_left;+			right_to_left.set_selected (d.right_to_left);+			GlyphCanvas.redraw ();+		});+		kerning_tools.add_tool (right_to_left);+		 		string empty_kerning_text = t_("Open a text file with kerning strings first."); 		 		previous_kerning_string = new Tool ("previous_kerning_string", t_("Previous kerning string"));@@ -176,8 +191,8 @@ public class KerningTools : ToolCollection  { 		expanders.add (font_name); 		expanders.add (zoom_expander); 		expanders.add (kerning_tools);+		expanders.add (otf_features);		 		expanders.add (classes);-		expanders.add (otf_features); 	} 	 	public static void add_otf_label (string tag) {@@ -266,6 +281,9 @@ public class KerningTools : ToolCollection  { 				add_unique_class (kr); 			} 		}+		+		classes.clear_cache ();+		classes.redraw (); 	}  	private static void remove_all_kerning_classes () {diff --git a/libbirdfont/LabelTool.vala b/libbirdfont/LabelTool.valaindex 5b9dd94..76d5f14 100644--- a/libbirdfont/LabelTool.vala+++ b/libbirdfont/LabelTool.vala@@ -79,8 +79,7 @@ public class LabelTool : Tool { 		}); 	} -	public override void clear_cache () {-		base.clear_cache ();+	void clear_cache () { 		selected_cache = null; 		deselected_cache = null; 	}@@ -92,29 +91,31 @@ public class LabelTool : Tool { 		if (is_selected ()) { 		 			if (selected_cache == null) {-				selected_cache = Screen.create_background_surface ((int) w, (int) h + 2);+				selected_cache = Screen.create_background_surface ((int) (w * Screen.get_scale ()), (int) ((h + 2) * Screen.get_scale ())); 				Context c = new Context ((!) selected_cache);-				c.scale (1 / Screen.get_scale (), 1 / Screen.get_scale ());+				c.scale (Screen.get_scale (), Screen.get_scale ()); 				draw_tool_surface (c, x, 2, true); 			} 			 			cr.save ();+			cr.scale (1 / Screen.get_scale (), 1 / Screen.get_scale ()); 			cr.set_antialias (Cairo.Antialias.NONE);-			cr.set_source_surface ((!) selected_cache, 0, (int) y - 2);+			cr.set_source_surface ((!) selected_cache, 0, (int) ((y - 2) * Screen.get_scale ())); 			cr.paint (); 			cr.restore (); 		} else { 		 			if (deselected_cache == null) {-				deselected_cache = Screen.create_background_surface ((int) w, (int) h + 2);+				deselected_cache = Screen.create_background_surface ((int) (w * Screen.get_scale ()), (int) ((h + 2) * Screen.get_scale ())); 				Context c = new Context ((!) deselected_cache);-				c.scale (1 / Screen.get_scale (), 1 / Screen.get_scale ());+				c.scale (Screen.get_scale (), Screen.get_scale ()); 				draw_tool_surface (c, x, 2, false); 			} 			 			cr.save ();+			cr.scale (1 / Screen.get_scale (), 1 / Screen.get_scale ()); 			cr.set_antialias (Cairo.Antialias.NONE);-			cr.set_source_surface ((!) deselected_cache, 0, (int) y - 2);+			cr.set_source_surface ((!) deselected_cache, 0, (int) ((y - 2) * Screen.get_scale ())); 			cr.paint (); 			cr.restore (); 		}diff --git a/libbirdfont/Layer.vala b/libbirdfont/Layer.valanew file mode 100644index 0000000..6058b49--- /dev/null+++ b/libbirdfont/Layer.vala@@ -0,0 +1,162 @@+/*+	Copyright (C) 2015 Johan Mattsson++	This library is free software; you can redistribute it and/or modify +	it under the terms of the GNU Lesser General Public License as +	published by the Free Software Foundation; either version 3 of the +	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but +	WITHOUT ANY WARRANTY; without even the implied warranty of +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +	Lesser General Public License for more details.+*/++namespace BirdFont {++public class Layer : GLib.Object {+	public PathList paths;+	public Gee.ArrayList<Layer> subgroups;+	public bool visible = true;+	public string name = "Layer";+	+	public bool is_counter = false;+	public Gradient? gradient = null;+	public bool single_path = false;+	+	public Layer () {+		paths = new PathList ();+		subgroups = new Gee.ArrayList<Layer> ();+	}++	public int index_of (Layer sublayer) {+		return subgroups.index_of (sublayer);+	}+	+	public PathList get_all_paths () {+		PathList p = new PathList ();+		+		p.append (paths);+		+		foreach (Layer sublayer in subgroups) {+			p.append (sublayer.get_all_paths ());+		}+		+		return p;+	}++	public PathList get_visible_paths () {+		PathList p = new PathList ();+		+		if (visible) {+			p.append (paths);+		}+		+		foreach (Layer sublayer in subgroups) {+			if (sublayer.visible) {+				p.append (sublayer.get_all_paths ());+			}+		}+		+		return p;+	}+		+	public void add_layer (Layer layer) {+		subgroups.add (layer);+	}++	public void add_path (Path path) {+		paths.add (path);+	}++	public void remove_path (Path path) {+		paths.remove (path);+		foreach (Layer sublayer in subgroups) {+			sublayer.remove_path (path);+		}+	}++	public void remove_layer (Layer layer) {+		subgroups.remove (layer);+		foreach (Layer sublayer in subgroups) {+			sublayer.remove_layer (layer);+		}+	}+		+	public Layer copy () {+		Layer layer = new Layer ();+		+		layer.name = name;+		layer.paths = paths.copy ();+		layer.visible = visible;+		+		foreach (Layer l in subgroups) {+			layer.subgroups.add (l.copy ());+		}++		if (gradient != null) {+			layer.gradient = ((!) gradient).copy ();+		}+		+		layer.single_path = single_path;+			+		return layer;+	}++	public void get_boundaries (out double x, out double y, out double w, out double h) {+		double px, py, px2, py2;+		+		px = Glyph.CANVAS_MAX;+		py = Glyph.CANVAS_MAX;+		px2 = Glyph.CANVAS_MIN;+		py2 = Glyph.CANVAS_MIN;+		+		foreach (Path p in get_all_paths ().paths) {+			if (px > p.xmin) {+				px = p.xmin;+			} ++			if (py > p.ymin) {+				py = p.ymin;+			}++			if (px2 < p.xmax) {+				px2 = p.xmax;+			}+			+			if (py2 < p.ymax) {+				py2 = p.ymax;+			}+		}+		+		w = px2 - px;+		h = py2 - py;+		x = px;+		y = py2;+	}+		+	public void print (int indent = 0) {+		foreach (Path p in paths.paths) {+			for (int i = 0; i < indent; i++) {+				stdout.printf ("\t");+			}+			stdout.printf (@"Path open: $(p.is_open ())");+			+			if (p.color != null) {+				stdout.printf (" %s", ((!) p.color).to_rgb_hex ());+			}+			+			stdout.printf ("\n");+		}+		+		foreach (Layer l in subgroups) {+			for (int i = 0; i < indent; i++) {+				stdout.printf ("\t");+			}+			stdout.printf ("%s\n", l.name);+			l.print (indent + 1);+		}+	}+}++}diff --git a/libbirdfont/LayerLabel.vala b/libbirdfont/LayerLabel.valaindex 80e87c0..f76c1a5 100644--- a/libbirdfont/LayerLabel.vala+++ b/libbirdfont/LayerLabel.vala@@ -13,7 +13,6 @@ */  using Cairo;-using SvgBird;  namespace BirdFont { @@ -28,15 +27,9 @@ public class LayerLabel : Tool { 	/** Add margin when layer is moves. */ 	bool active_layer = false; 	-	static TextArea? help_text_hide = null;-	 	public LayerLabel (Layer layer) { 		base (); -		if (help_text_hide == null) {-			update_description ();-		}- 		this.layer = layer; 		this.label = layer.name; 		@@ -46,10 +39,10 @@ public class LayerLabel : Tool {  		panel_press_action.connect ((selected, button, tx, ty) => {	 			if (y <= ty <= y + h) {-				if (tx >= w - 30) {+				if (tx >= w - 30 * Toolbox.get_scale ()) { 					DrawingTools.deselect_layers (); 					remove_layer ();-				} else if (tx < 25) {+				} if (tx < 25 * Toolbox.get_scale ()) { 					layer.visible = !layer.visible; 					GlyphCanvas.redraw (); 					BirdFont.get_current_font ().touch ();@@ -83,13 +76,6 @@ public class LayerLabel : Tool { 				redraw (); 			} 			-			if (y <= ty <= y + h) {-				if (tx < 25 && help_text_hide != null) {-					Help help = MainWindow.get_help ();-					help.set_help_text ((!) help_text_hide);-				}-			}-			 			return false; 		}); @@ -97,16 +83,7 @@ public class LayerLabel : Tool { 			active_layer = false; 		}); 	}--	void update_description () {-		help_text_hide = Help.create_help_text (t_("Hide the layer."));	-	}--	public override void clear_cache () {-		base.clear_cache ();-		update_description ();-	}-		+	 	void move_layer_up () { 		int i; 		Glyph g = MainWindow.get_current_glyph ();diff --git a/libbirdfont/LayerUtils.vala b/libbirdfont/LayerUtils.valadeleted file mode 100644index 01480aa..0000000--- a/libbirdfont/LayerUtils.vala+++ /dev/null@@ -1,128 +0,0 @@-/*-	Copyright (C) 2015 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using SvgBird;--namespace BirdFont {--public class LayerUtils {--	public static Gee.ArrayList<SvgBird.Object> get_visible_objects (Layer layer) {-		ObjectGroup group = new ObjectGroup ();-		add_visible_objects (layer, group);-		return group.objects;-	}--	public static void add_visible_objects (Layer layer, ObjectGroup objects) {-		foreach (SvgBird.Object o in layer.objects) {-			if (o is Layer) {-				Layer sublayer = (Layer) o;-				-				if (sublayer.visible) {-					add_visible_objects (sublayer, objects);-				}-			} else {-				if (o.visible) {-					objects.add (o);-				}-			}-		}-	}-	-	public static PathList get_all_paths (Layer layer) {-		PathList paths = new PathList ();-		add_paths_to_group (layer, paths);-		return paths;-	}--	public static void add_paths_to_group (Layer layer, PathList paths) {-		foreach (SvgBird.Object o in layer.objects) {-			if (o is PathObject) {-				PathObject p = (PathObject) o;-				paths.add (p.get_path ());-			} else if (o is Layer) {-				add_visible_paths_to_group ((Layer) o, paths);-			}-		}-	}--	public static PathList get_visible_paths (Layer layer) {-		PathList paths = new PathList ();-		add_visible_paths_to_group (layer, paths);-		return paths;-	}--	public static void add_visible_paths_to_group (Layer layer, PathList paths) {-		foreach (SvgBird.Object o in layer.objects) {-			if (o.visible) {-				if (o is PathObject) {-					PathObject p = (PathObject) o;-					paths.add (p.get_path ());-				} else if (o is Layer) {-					add_visible_paths_to_group ((Layer) o, paths);-				}-			}-		}-	}-			-	public static void add_path (Layer layer, Path path) {-		PathObject p = new PathObject.for_path (path);-		layer.add_object (p);-	}--	public static void append_paths (Layer layer, PathList path_list) {-		foreach (Path p in path_list.paths) {-			add_path (layer, p);-		}-	}--	private static PathObject? get_object_path (Layer layer, Path path) {-		foreach (SvgBird.Object o in layer.objects) {-			if (o is PathObject) {-				PathObject p = (PathObject) o;-				if (p.get_path () == path) {-					return p;-				}-			}-		}-		-		return null;-	}-	-	public static void remove_path (Layer layer, Path path) {-		PathObject? p = get_object_path (layer, path);-		-		if (p != null) {-			layer.objects.remove ((!) p);-		}--		foreach (SvgBird.Layer sublayer in layer.get_sublayers ()) {-			remove_path (sublayer, path);-		}-	}--	public static PathList get_paths_in_layer (Layer layer) {-		PathList paths = new PathList ();-		-		foreach (SvgBird.Object object in layer.objects) {-			if (object is PathObject) {-				paths.add (((PathObject) object).get_path ());-			}-		}-		-		return paths;-	}-}--}diff --git a/libbirdfont/LicenseDialog.vala b/libbirdfont/LicenseDialog.valaindex 4225136..8d2fbb7 100644--- a/libbirdfont/LicenseDialog.vala+++ b/libbirdfont/LicenseDialog.vala@@ -28,11 +28,11 @@ public class LicenseDialog : Dialog { 	static const double margin = 20; 	 	public LicenseDialog () {-		Color color = Theme.get_color ("Text Tool Box");-		agreement = new TextArea (font_size, color);+		agreement = new TextArea (font_size); 		agreement.min_width = 300; 		agreement.set_editable (false); 		agreement.draw_border = false;+		agreement.text_color = Theme.get_color ("Text Tool Box"); 		agreement.set_text ("BirdFont is developed with donations, please consider donating to the project.\n\nThis is the freeware version of BirdFont. You may use it for creating fonts under the SIL Open Font License.\n\nWhich license do you want to use for your font?"); 		 		decline = new Button ("Commercial License");diff --git a/libbirdfont/Ligatures.vala b/libbirdfont/Ligatures.valaindex 296e647..3f1516e 100644--- a/libbirdfont/Ligatures.vala+++ b/libbirdfont/Ligatures.vala@@ -58,10 +58,6 @@ public class Ligatures : GLib.Object { 			 			lig = new GlyphSequence (); 			foreach (string n in font.get_names (ligature)) {-				if (n == "space") {-					n = " ";-				}-				 				gc = font.get_glyph_collection_by_name (n); 				 				if (gc == null) {@@ -73,10 +69,6 @@ public class Ligatures : GLib.Object { 			 			gs = new GlyphSequence (); 			foreach (string s in subst_names) {-				if (s == "space") {-					s = " ";-				}-				 				gc = font.get_glyph_collection_by_name (s); 				 				if (gc == null) {diff --git a/libbirdfont/LoadCallback.vala b/libbirdfont/LoadCallback.valaindex d720ac3..979d391 100644--- a/libbirdfont/LoadCallback.vala+++ b/libbirdfont/LoadCallback.vala@@ -86,8 +86,6 @@ public class LoadCallback : GLib.Object { 				 				f = BirdFont.new_font (); 				-				MainWindow.clear_glyph_cache ();-				 				f.set_file ((!) fn); 				Preferences.add_recent_files ((!) fn); 				MainWindow.native_window.load ();diff --git a/libbirdfont/MainWindow.vala b/libbirdfont/MainWindow.valaindex c4f028a..471189e 100644--- a/libbirdfont/MainWindow.vala+++ b/libbirdfont/MainWindow.vala@@ -1,5 +1,5 @@ /*
-	Copyright (C) 2012 2014 2016 Johan Mattsson
+	Copyright (C) 2012 2014 Johan Mattsson
 
 	This library is free software; you can redistribute it and/or modify 
 	it under the terms of the GNU Lesser General Public License as 
@@ -32,7 +32,7 @@ public class MainWindow : GLib.Object { 	public static Dialog dialog;
 	public static SpacingTab spacing_tab;
 	public static Task blocking_background_task;
-	public static Help help;
+	public static Scrollbar scrollbar; 	
 	/** Number of pixels per mm */
 	public static double units = 1;
@@ -56,15 +56,15 @@ public class MainWindow : GLib.Object { 		dialog = new Dialog ();
 		spacing_tab = new SpacingTab ();
 		blocking_background_task = new Task (null);
-		help = new Help ();
+		scrollbar = new Scrollbar ();		 		
 		tools.select_tool (DrawingTools.bezier_tool);
 	}
++	public static bool has_scrollbar () {+		return scrollbar.is_visible ();+	}	 	
-	public static Help get_help () {
-		return help;
-	}
-
 	public static void abort_task () {
 		blocking_background_task.cancel ();
 	}
@@ -112,7 +112,14 @@ public class MainWindow : GLib.Object { 		}
 	}
 
-	public static void  show_message (string text) {
+	public static void show_message (string text) {+		Tab t = MainWindow.get_tab_bar ().get_selected_tab ();
+		string tab_name = t.get_display ().get_name ();+
+		if (tab_name == "Preview") {+			MenuTab.select_overview ();
+		}+		 		MessageDialog md = new MessageDialog (text);
 		show_dialog (md);
 	}
@@ -222,16 +229,6 @@ public class MainWindow : GLib.Object { 	public static bool select_tab (Tab t) {
 		return tabs.selected_open_tab (t);
 	}
-
-	public static OverView get_overview () {
-		foreach (Tab t in tabs.tabs) {
-			if (t.get_display () is OverView) {
-				return (OverView) t.get_display ();
-			}
-		}
-		
-		return overview;
-	}
 	
 	public static SpacingClassTab get_spacing_class_tab () {
 		return spacing_class_tab;
@@ -259,40 +256,27 @@ public class MainWindow : GLib.Object { 	
 	public static void hide_scrollbar () {
 		if (!is_null (MainWindow.native_window)) {
-			MainWindow.native_window.set_scrollbar_size (-1);
+			MainWindow.scrollbar.set_size (-1);
 		}
 	}	
 
 	public static void show_scrollbar () {
 		if (!is_null (MainWindow.native_window)) {
-			MainWindow.native_window.set_scrollbar_size (scrollbar_size);
+			MainWindow.scrollbar.set_size (scrollbar_size);
 		}
 	}
 	
 	public static void set_scrollbar_size (double size) {
 		if (!is_null (MainWindow.native_window)) {
 			scrollbar_size = size;
-			MainWindow.native_window.set_scrollbar_size (size);
+			MainWindow.scrollbar.set_size (size);
 		}
 	}
 	
 	public static void set_scrollbar_position (double position) {
 		if (!is_null (MainWindow.native_window)) {
-			MainWindow.native_window.set_scrollbar_position (position);
-		}
-	}
-
-	/** Reaload all paths and help lines from disk. */
-	public static void clear_glyph_cache () {
-		Glyph g;
-		foreach (Tab t in get_tab_bar ().tabs) {
-			if (t.get_display () is Glyph) {
-				g = (Glyph) t.get_display ();
-				g.add_help_lines ();
-			}
+			MainWindow.scrollbar.set_position (position);
 		}
-		
-		GlyphCanvas.redraw ();
 	}
 		
 	public static void close_all_tabs () {
@@ -347,6 +331,16 @@ public class MainWindow : GLib.Object { 	public static void set_toolbox (Toolbox tb) {
 		tools = tb;
 	}
++	public static OverView get_overview () {+		foreach (Tab t in tabs.tabs) {+			if (t.get_display () is OverView) {+				return (OverView) t.get_display ();+			}+		}+		+		return overview;+	}
 }
 
 }
diff --git a/libbirdfont/Menu.vala b/libbirdfont/Menu.valaindex c0d1234..a3004be 100644--- a/libbirdfont/Menu.vala+++ b/libbirdfont/Menu.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2014 - 2016 Johan Mattsson+	Copyright (C) 2014 2015 Johan Mattsson  	This library is free software; you can redistribute it and/or modify  	it under the terms of the GNU Lesser General Public License as @@ -287,37 +287,17 @@ public class Menu : AbstractMenu {  		MenuItem import_svg = add_menu_item (t_("Import SVG file"), "import svg file", "Glyph"); 		import_svg.action.connect (() => {-			SvgParser.import (SvgType.REGULAR);+			SvgParser.import (); 			show_menu = false; 		}); 		export_menu.items.add (import_svg);-				+		 		MenuItem import_svg_folder = add_menu_item (t_("Import SVG folder"), "import svg folder", ""); 		import_svg_folder.action.connect (() => {-			SvgParser.import_folder (SvgType.REGULAR);+			SvgParser.import_folder (); 			show_menu = false; 		}); 		export_menu.items.add (import_svg_folder);--		if (BirdFont.has_argument ("--test")) {-			MenuItem import_color_svg;-			import_color_svg = add_menu_item (t_("Import SVG file")  + ", " + t_("color"),-				"import svg file color", "Glyph");-			import_color_svg.action.connect (() => {-				SvgParser.import (SvgType.COLOR);-				show_menu = false;-			});-			export_menu.items.add (import_color_svg);--			MenuItem import_svg_color_folder;-			import_svg_color_folder = add_menu_item (t_("Import SVG folder") + ", " + t_("color"), -				"import svg folder color", "");-			import_svg_color_folder.action.connect (() => {-				SvgParser.import_folder (SvgType.COLOR);-				show_menu = false;-			});-			export_menu.items.add (import_svg_color_folder);-		} 		 		MenuItem import_background_image = add_menu_item (t_("Import Background Image"), "import background image"); 		import_background_image.action.connect (() => {@@ -412,7 +392,12 @@ public class Menu : AbstractMenu {  		MenuItem next_kerning_pair = add_menu_item (t_("Select Next Kerning Pair"), "select next kerning pair"); 		next_kerning_pair.action.connect (() => {-			KerningDisplay.next_pair ();+			if (KerningDisplay.right_to_left)  {+				KerningDisplay.previous_pair ();			+			} else {+				KerningDisplay.next_pair ();+			}+			 			show_menu = false; 		}); 		next_kerning_pair.add_display("Kerning");@@ -421,7 +406,12 @@ public class Menu : AbstractMenu {  		MenuItem previous_kerning_pair = add_menu_item (t_("Select Previous Kerning Pair"), "select previous kerning pair"); 		previous_kerning_pair.action.connect (() => {-			KerningDisplay.previous_pair ();+			if (KerningDisplay.right_to_left)  {+				KerningDisplay.next_pair ();			+			} else {+				KerningDisplay.previous_pair ();+			}+			 			show_menu = false; 		}); 		previous_kerning_pair.add_display("Kerning");@@ -509,16 +499,7 @@ public class Menu : AbstractMenu { 			show_menu = false; 		}); 		menu.items.add (version);--		MenuItem help = add_menu_item (t_("Help"), "help");-		help.action.connect (() => {-			Help help_box = MainWindow.get_help ();-			help_box.set_visible (!help_box.is_visible ());-			GlyphCanvas.redraw ();-			show_menu = false;-		});-		menu.items.add (help);-			+	 		set_current_menu (menu); 		top_menu = menu; 		diff --git a/libbirdfont/MenuItem.vala b/libbirdfont/MenuItem.valaindex 1453dc9..735029a 100644--- a/libbirdfont/MenuItem.vala+++ b/libbirdfont/MenuItem.vala@@ -23,8 +23,8 @@ public class MenuItem : GLib.Object { 	public double y; 	 	// key bindings-	public virtual uint modifiers { get; set; default = NONE; }-	public virtual unichar key { get; set; default = '\0'; }+	public uint modifiers = NONE;+	public unichar key = '\0'; 	 	public Gee.ArrayList<string> displays = new Gee.ArrayList<string> ();	 	diff --git a/libbirdfont/MenuTab.vala b/libbirdfont/MenuTab.valaindex 6283739..700cf92 100644--- a/libbirdfont/MenuTab.vala+++ b/libbirdfont/MenuTab.vala@@ -12,8 +12,6 @@ 	Lesser General Public License for more details. */ -using SvgBird;- namespace BirdFont {  public class MenuTab : FontDisplay {@@ -124,7 +122,8 @@ public class MenuTab : FontDisplay { 		Font current_font = BirdFont.get_current_font (); 		string ttf_name = ExportSettings.get_file_name (current_font) + ".ttf"; 		string ttf_name_mac = ExportSettings.get_file_name_mac (current_font) + ".ttf";-+		+		print (@"$ttf_name == $ttf_name_mac"); 		if (ttf_name == ttf_name_mac) { 			MainWindow.show_message (t_("You need to choose a different name for the TTF file with Mac adjustmets.")); 			ttf_name_mac = ExportSettings.get_file_name_mac (current_font) + " Mac.ttf";@@ -211,7 +210,12 @@ public class MenuTab : FontDisplay { 	public static void signal_file_exported () { 		IdleSource idle = new IdleSource (); 		idle.set_callback (() => {-			export_callback.file_exported ();+			export_callback.file_exported ();			+			+			if (ExportTool.error_message != null) {+				MainWindow.show_message (t_("Can't create TTF font.") + "\n" + (!) ExportTool.error_message);+			}
+ 			return false; 		}); 		idle.attach (null);@@ -277,7 +281,6 @@ public class MenuTab : FontDisplay { 		 		DrawingTools.set_stroke_tool_visibility (); - 		string lock_grid = f.settings.get_setting ("lock_grid"); 		bool lg = bool.parse (lock_grid);		 		GridTool.lock_grid = lg;@@ -328,7 +331,6 @@ public class MenuTab : FontDisplay { 		MainWindow.get_toolbox ().update_expanders (); 		MainWindow.get_toolbox ().update_all_expanders (); 		Toolbox.redraw_tool_box ();-		OverViewItem.glyph_scale = 1; 	} 	 	// FIXME: background thread@@ -436,6 +438,8 @@ public class MenuTab : FontDisplay { 		} else { 			MainWindow.show_dialog (new SaveDialog (dialog)); 		}+		+		MainWindow.native_window.update_window_size (); 	}  	 	public static void show_export_settings_tab () {@@ -647,29 +651,29 @@ public class MenuTab : FontDisplay { 		Gee.ArrayList<Path> paths = new Gee.ArrayList<Path> (); 		 		// selected objects-		foreach (Path p in g.get_active_paths ()) {+		foreach (Path p in g.active_paths) { 			paths.add (PenTool.simplify (p, false, PenTool.simplification_threshold)); 		} 		 		// selected segments 		if (paths.size == 0) {-			foreach (Path p in g.get_active_paths ()) {+			foreach (Path p in g.get_all_paths ()) { 				g.add_active_path (null, p); 			} 			-			foreach (Path p in g.get_active_paths ()) {+			foreach (Path p in g.active_paths) { 				paths.add (PenTool.simplify (p, true, PenTool.simplification_threshold)); 			} 		} 		 		g.store_undo_state (); 		-		foreach (SvgBird.Object o in g.active_paths) {-			g.layers.remove (o);+		foreach (Path p in g.active_paths) {+			g.layers.remove_path (p); 		} -		foreach (Path p in g.get_active_paths ()) {-			LayerUtils.remove_path (g.layers, p);+		foreach (Path p in g.active_paths) {+			g.layers.remove_path (p); 		} 				 		foreach (Path p in paths) {diff --git a/libbirdfont/MoveTool.vala b/libbirdfont/MoveTool.valaindex 9da3b2d..4c6c71d 100644--- a/libbirdfont/MoveTool.vala+++ b/libbirdfont/MoveTool.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2012 2013 2015 2016 Johan Mattsson+	Copyright (C) 2012 2013 Johan Mattsson  	This library is free software; you can redistribute it and/or modify  	it under the terms of the GNU Lesser General Public License as @@ -14,7 +14,6 @@  using Math; using Cairo;-using SvgBird;  namespace BirdFont { @@ -38,8 +37,8 @@ public class MoveTool : Tool { 	public signal void objects_moved (); 	public signal void objects_deselected (); 	-	public MoveTool (string n) {-		base (n, t_("Move paths"));+	public MoveTool (string name) {+		base (name, t_("Move paths"));  		selection_changed.connect (() => { 			update_selection_boundaries ();@@ -95,13 +94,8 @@ public class MoveTool : Tool { 				g.store_undo_state (); 			} 			-			foreach (SvgBird.Object p in g.active_paths) {-				if (p is PathObject) {-					LayerUtils.remove_path (g.layers, ((PathObject) p).get_path ());-				} else {-					g.layers.remove (p);-				}-				+			foreach (Path p in g.active_paths) {+				g.layers.remove_path (p); 				g.update_view (); 			} @@ -115,8 +109,9 @@ public class MoveTool : Tool { 	 	public void move (int x, int y) { 		Glyph glyph = MainWindow.get_current_glyph ();-		double dx = Glyph.path_coordinate_x (last_x) - Glyph.path_coordinate_x (x);-		double dy = Glyph.path_coordinate_y (last_y) - Glyph.path_coordinate_y (y); +		double dx = last_x - x;+		double dy = last_y - y; +		double p = PenTool.precision; 		double delta_x, delta_y; 		 		if (!move_path) {@@ -126,11 +121,21 @@ public class MoveTool : Tool { 		if (move_path && (fabs(dx) > 0 || fabs (dy) > 0)) { 			moved = true; -			delta_x = -dx;-			delta_y = -dy;+			delta_x = Glyph.ivz () * -dx * p;+			delta_y = Glyph.ivz () * dy * p;+							+			foreach (Layer group in glyph.selected_groups) {+				if (group.gradient != null) {+					Gradient g = (!) group.gradient;+					g.x1 += delta_x;+					g.x2 += delta_x;+					g.y1 += delta_y;+					g.y2 += delta_y;+				}+			} 			-			foreach (SvgBird.Object object in glyph.active_paths) {-				object.move (delta_x, delta_y);+			foreach (Path path in glyph.active_paths) {+				path.move (delta_x, delta_y); 			} 		} @@ -157,7 +162,7 @@ public class MoveTool : Tool { 		if (GridTool.is_visible () && moved) { 			tie_paths_to_grid (glyph); 		} else if (GridTool.has_ttf_grid ()) {-			foreach (SvgBird.Object p in glyph.active_paths) {+			foreach (Path p in glyph.active_paths) { 				tie_path_to_ttf_grid (p); 			} 		} @@ -174,11 +179,8 @@ public class MoveTool : Tool { 			objects_moved (); 			DrawingTools.resize_tool.signal_objects_rotated (); 			-			foreach (SvgBird.Object o in glyph.active_paths) {-				if (o is PathObject) {-					PathObject path = (PathObject) o;-					path.get_path ().create_full_stroke ();-				}+			foreach (Path p in glyph.active_paths) {+				p.create_full_stroke (); 			} 		} else { 			objects_deselected ();@@ -187,36 +189,42 @@ public class MoveTool : Tool { 		 	public void press (int b, int x, int y) { 		Glyph glyph = MainWindow.get_current_glyph ();-		SvgBird.Object object;+		Path p; 		bool selected = false;-		SvgBird.Object? o;+		Layer? group;+		Layer g; 		-		glyph.store_undo_state ();	-		double px = Glyph.path_coordinate_x (x);-		double py = Glyph.path_coordinate_y (y);-		o = glyph.get_object_at (px, py);--		if (o != null) {-			object = (!) o;-			selected = glyph.active_paths_contains (object);- 			+		glyph.store_undo_state ();+		group_selection = false;+		+		group = glyph.get_path_at (x, y);+		+		if (group != null) {+			g = (!) group;+			return_if_fail (g.paths.paths.size > 0);+			p = g.paths.paths.get (0);+			selected = glyph.active_paths.contains (p);+			 			if (!selected && !KeyBindings.has_shift ()) { 				glyph.clear_active_paths (); 			}  			-			if (selected && KeyBindings.has_shift ()) {-				glyph.active_paths.remove (object);-			} else {-				glyph.add_active_object (null, object);-			}			+			foreach (Path lp in g.paths.paths) {+				if (selected && KeyBindings.has_shift ()) {+					glyph.selected_groups.remove ((!) group);+					glyph.active_paths.remove (lp);+				} else {+					glyph.add_active_path ((!) group, lp);+				}+			} 		} else if (!KeyBindings.has_shift ()) { 			glyph.clear_active_paths (); 		}+		+		move_path = true;  		update_selection_boundaries ();--		move_path = true;-		+					 		last_x = x; 		last_y = y; 		@@ -230,7 +238,8 @@ public class MoveTool : Tool { 		selection_changed (); 		GlyphCanvas.redraw (); 	}-		+	+	 	void select_group () { 		double x1 = Glyph.path_coordinate_x (Math.fmin (selection_x, last_x)); 		double y1 = Glyph.path_coordinate_y (Math.fmin (selection_y, last_y));@@ -240,10 +249,10 @@ public class MoveTool : Tool { 		 		glyph.clear_active_paths (); 		-		foreach (SvgBird.Object p in glyph.get_objects_in_current_layer ()) {+		foreach (Path p in glyph.get_paths_in_current_layer ()) { 			if (p.xmin > x1 && p.xmax < x2 && p.ymin < y1 && p.ymax > y2) {-				if (!p.is_empty ()) {-					glyph.add_active_object (null, p);+				if (p.points.size > 0) {+					glyph.add_active_path (null, p); 				} 			} 		}@@ -264,7 +273,7 @@ public class MoveTool : Tool { 		 		get_selection_box_boundaries (out x, out y, out w, out h); 		-		foreach (SvgBird.Object path in glyph.active_paths) {+		foreach (Path path in glyph.active_paths) { 			path.move (glyph.left_limit - x + w / 2, font.base_line - y + h / 2); 		} 		@@ -272,6 +281,23 @@ public class MoveTool : Tool { 		objects_moved (); 		GlyphCanvas.redraw (); 	}++	static void draw_selection_box (Context cr) {+		double x = Math.fmin (selection_x, last_x);+		double y = Math.fmin (selection_y, last_y);++		double w = Math.fabs (selection_x - last_x);+		double h = Math.fabs (selection_y - last_y);+		+		cr.save ();+		+		Theme.color (cr, "Foreground 1");+		cr.set_line_width (2);+		cr.rectangle (x, y, w, h);+		cr.stroke ();+		+		cr.restore ();+	} 	 	public static void get_selection_box_boundaries (out double x, out double y, out double w, out double h) { 		double px, py, px2, py2;@@ -282,26 +308,23 @@ public class MoveTool : Tool { 		px2 = -10000; 		py2 = -10000; 		-		foreach (SvgBird.Object o in glyph.active_paths) {-			if (o is PathObject) {-				Path p = ((PathObject) o).get_path ();-				p.update_region_boundaries ();-				-				if (px > p.xmin) {-					px = p.xmin;-				} +		foreach (Path p in glyph.active_paths) {+			p.update_region_boundaries ();+			+			if (px > p.xmin) {+				px = p.xmin;+			}  -				if (py > p.ymin) {-					py = p.ymin;-				}+			if (py > p.ymin) {+				py = p.ymin;+			} -				if (px2 < p.xmax) {-					px2 = p.xmax;-				}-				-				if (py2 < p.ymax) {-					py2 = p.ymax;-				}+			if (px2 < p.xmax) {+				px2 = p.xmax;+			}+			+			if (py2 < p.ymax) {+				py2 = p.ymax; 			} 		} 		@@ -335,7 +358,7 @@ public class MoveTool : Tool { 				break; 		} 		-		foreach (SvgBird.Object path in glyph.active_paths) {+		foreach (Path path in glyph.active_paths) { 			path.move (x * Glyph.ivz (), y * Glyph.ivz ()); 		} 		@@ -343,10 +366,10 @@ public class MoveTool : Tool { 		PenTool.reset_stroke (); 		update_selection_boundaries (); 		objects_moved ();-		glyph.redraw_area (0, 0, glyph.allocation.width, glyph.allocation.height);+		GlyphCanvas.redraw (); 	} -	static void tie_path_to_ttf_grid (SvgBird.Object p) {+	static void tie_path_to_ttf_grid (Path p) { 		double sx, sy, qx, qy;	  		sx = p.xmax;@@ -396,7 +419,7 @@ public class MoveTool : Tool { 		dx_min = Math.fabs (qx - minx); 		dx_max = Math.fabs (sx - maxx); 		-		foreach (SvgBird.Object p in g.active_paths) {+		foreach (Path p in g.active_paths) { 			if (dy_min < dy_max) { 				p.move (0, qy - miny); 			} else {@@ -415,10 +438,8 @@ public class MoveTool : Tool { 	 	public static void update_boundaries_for_selection () { 		Glyph glyph = MainWindow.get_current_glyph ();-		foreach (SvgBird.Object o in glyph.active_paths) {-			if (o is PathObject) {-				((PathObject)o).get_path ().update_region_boundaries ();-			}+		foreach (Path p in glyph.active_paths) {+			p.update_region_boundaries (); 		} 	} 	@@ -440,19 +461,14 @@ public class MoveTool : Tool { 		xc = selection_box_center_x; 		yc = selection_box_center_y; -		foreach (SvgBird.Object p in glyph.active_paths) {-			if (p is PathObject) {-				Path path = ((PathObject) p).get_path ();-				-				// FIXME: move to object-				if (vertical) {-					path.flip_vertical ();-				} else {-					path.flip_horizontal ();-				}-				-				path.reverse ();+		foreach (Path p in glyph.active_paths) {+			if (vertical) {+				p.flip_vertical ();+			} else {+				p.flip_horizontal (); 			}+			+			p.reverse (); 		}  		get_selection_box_boundaries (out xc2, out yc2, out w, out h); @@ -460,7 +476,7 @@ public class MoveTool : Tool { 		dx = -(xc2 - xc); 		dy = -(yc2 - yc); 		-		foreach (SvgBird.Object p in glyph.active_paths) {+		foreach (Path p in glyph.active_paths) { 			p.move (dx, dy); 		} 		@@ -474,9 +490,9 @@ public class MoveTool : Tool { 		Glyph g = MainWindow.get_current_glyph (); 		 		g.clear_active_paths ();-		foreach (SvgBird.Object p in g.get_objects_in_current_layer ()) {-			if (!p.is_empty ()) {-				g.add_active_object (null, p);+		foreach (Path p in g.get_paths_in_current_layer ()) {+			if (p.points.size > 0) {+				g.add_active_path (null, p); 			} 		} 		@@ -485,21 +501,6 @@ public class MoveTool : Tool { 		update_selection_boundaries (); 		objects_moved (); 	}--	static void draw_selection_box (Context cr) {-		double x = Math.fmin (selection_x, last_x);-		double y = Math.fmin (selection_y, last_y);--		double w = Math.fabs (selection_x - last_x);-		double h = Math.fabs (selection_y - last_y);-		-		cr.save ();			-		Theme.color (cr, "Foreground 1");-		cr.set_line_width (2);-		cr.rectangle (x, y, w, h);-		cr.stroke ();-		cr.restore ();-	} }  }diff --git a/libbirdfont/NativeWindow.vala b/libbirdfont/NativeWindow.valaindex 314d035..017d973 100644--- a/libbirdfont/NativeWindow.vala+++ b/libbirdfont/NativeWindow.vala@@ -27,9 +27,6 @@ public interface NativeWindow : GLib.Object { 	public abstract void set_clipboard (string data); 	public abstract void set_inkscape_clipboard (string data); -	public abstract void set_scrollbar_size (double size);-	public abstract void set_scrollbar_position (double position);-	 	/** Notify the UI about the new font. */ 	public abstract void font_loaded (); diff --git a/libbirdfont/OpenFontFormat/AlternateFeature.vala b/libbirdfont/OpenFontFormat/AlternateFeature.valaindex 0a40223..9434b7a 100644--- a/libbirdfont/OpenFontFormat/AlternateFeature.vala+++ b/libbirdfont/OpenFontFormat/AlternateFeature.vala@@ -24,7 +24,7 @@ public class AlternateFeature : GLib.Object { 		 		this.tag = tag; 		this.glyf_table = glyf_table;-		alternates = font.alternates.get_alt (tag);+		alternates = font.alternates.get_alt_with_glyph (tag, font);  		alternates.sort ((a, b) => { 			Alternate alt1 = (Alternate) a;diff --git a/libbirdfont/OpenFontFormat/CodePageBits.vala b/libbirdfont/OpenFontFormat/CodePageBits.valaindex c079e44..88abe99 100644--- a/libbirdfont/OpenFontFormat/CodePageBits.vala+++ b/libbirdfont/OpenFontFormat/CodePageBits.vala@@ -28,7 +28,7 @@ public class CodePageBits : GLib.Object { 		 	public CodePageBits () { 		if (database == null) {-			open_database (get_database_file ());+			open_database (get_database_file (), OPEN_READONLY); 		} 	} @@ -192,7 +192,7 @@ public class CodePageBits : GLib.Object { 				f.delete (); 			} 			-			open_database (f);+			open_database (f, OPEN_READWRITE); 			create_tables (); 		 			default_range = new PageBit (-1, "null-");@@ -242,8 +242,8 @@ public class CodePageBits : GLib.Object { 		} 	} 	-	void open_database (File db_file) {-		int rc = Database.open ((!) db_file.get_path (), out database);+	void open_database (File db_file, int access) {+		int rc = Database.open_v2 ((!) db_file.get_path (), out database, access);  		db = (!) database; @@ -333,3 +333,4 @@ public class CodePageBits : GLib.Object { }  }+ \ No newline at end of filediff --git a/libbirdfont/OpenFontFormat/ContextualLigature.vala b/libbirdfont/OpenFontFormat/ContextualLigature.valaindex d2959a2..8719b3e 100644--- a/libbirdfont/OpenFontFormat/ContextualLigature.vala+++ b/libbirdfont/OpenFontFormat/ContextualLigature.vala@@ -169,11 +169,6 @@ public class ContextualLigature : GLib.Object { 		 		gs = new GlyphSequence (); 		foreach (string s in font.get_names (context)) {-			-			if (s == "space") {-				s = " ";-			}-			 			gc = font.get_glyph_collection_by_name (s); 			 			if (gc == null) {diff --git a/libbirdfont/OpenFontFormat/DirectoryTable.vala b/libbirdfont/OpenFontFormat/DirectoryTable.valaindex 58155ea..39f8a27 100644--- a/libbirdfont/OpenFontFormat/DirectoryTable.vala+++ b/libbirdfont/OpenFontFormat/DirectoryTable.vala@@ -33,7 +33,6 @@ public class DirectoryTable : OtfTable { 	public Os2Table  os_2_table; 	public PostTable post_table; 	public LocaTable loca_table;-	public SvgTable svg_table; 	 	public OffsetTable offset_table; 	@@ -58,7 +57,6 @@ public class DirectoryTable : OtfTable { 		name_table = new NameTable (); 		os_2_table = new Os2Table (glyf_table, hmtx_table, hhea_table);  		post_table = new PostTable (glyf_table);-		svg_table = new SvgTable (); 		 		id = "Directory table"; 		@@ -83,7 +81,6 @@ public class DirectoryTable : OtfTable { 		post_table.process (); 		kern_table.process (); 		gpos_table.process (glyf_table);-		svg_table.process (glyf_table); 		 		offset_table.process (); 		process_directory (); // this table@@ -105,10 +102,6 @@ public class DirectoryTable : OtfTable { 			 			tables.add (os_2_table); -			if (svg_table.has_glyphs ()) {-				tables.add (svg_table);-			}- 			// tables.append (gdef_table); // invalid table 			 			tables.add (cmap_table);diff --git a/libbirdfont/OpenFontFormat/FontData.vala b/libbirdfont/OpenFontFormat/FontData.valaindex 84cfe92..4a42023 100644--- a/libbirdfont/OpenFontFormat/FontData.vala+++ b/libbirdfont/OpenFontFormat/FontData.vala@@ -14,7 +14,7 @@  namespace BirdFont { -public class FontData : GLib.Object {+public class FontData : Object {  	// Read pointer 	uint rp = 0;diff --git a/libbirdfont/OpenFontFormat/GlyfData.vala b/libbirdfont/OpenFontFormat/GlyfData.valaindex 2b87c24..2fa75c6 100644--- a/libbirdfont/OpenFontFormat/GlyfData.vala+++ b/libbirdfont/OpenFontFormat/GlyfData.vala@@ -16,7 +16,7 @@ using Math;  namespace BirdFont { -public class CoordinateFlags : GLib.Object {+public class CoordinateFlags { 	/** TTF coordinate flags. */  	public static const uint8 NONE           = 0;@@ -43,7 +43,7 @@ public class GlyfData : GLib.Object { 	public Gee.ArrayList<int16> coordinate_y = new Gee.ArrayList<int16> (); 	 	uint16 end_point = 0;-	int16 nflags = 0;+	uint16 nflags = 0; 	 	Glyph glyph; 	@@ -58,53 +58,48 @@ public class GlyfData : GLib.Object { 		 	public GlyfData (Glyph g) { 		bool process;-		PathList qp = g.get_quadratic_paths (); +		PathList all_quadratic = g.get_quadratic_paths (); +		PathList qp = new PathList (); 		 		glyph = g; 						-		foreach (Path p in qp.paths) {+		int i = 0;+		foreach (Path p in all_quadratic.paths) { 			if (p.points.size > 0) {-				if (!is_empty (p)) {+				if (likely (!is_empty (p))) { 					// Add points at extrema 					p.add_extrema ();+					qp.add (p);+				} else {+					warning (@"Path number $i is empty in $(glyph.get_name ())"); 				}+				i++; 			} 		} 		-		process = true;-		-		while (process) {-			points.clear ();-			paths.clear ();-			foreach (Path p in qp.paths) {-				if (!is_empty (p)) {-					paths.add (p);-					foreach (EditPoint ep in p.points) {-						points.add (ep);-					}-				}-			}-			-			if (paths.size == 0) {-				break;+		points.clear ();+		paths.clear ();+		foreach (Path p in qp.paths) {+			paths.add (p);++			foreach (EditPoint ep in p.points) {+				points.add (ep); 			}+		} 			+		if (paths.size > 0) { 			process_end_points (); 			process_flags (); 			process_x ();-			-			// error checking is done here-			process = !process_y (); -			+			process_y (); 	 			process_bounding_box ();-		 }+		} 	}  	bool is_empty (Path p) { 		EditPoint? last = null; 		 		if (unlikely (p.points.size < 2)) {-			warning (@"A path in $(glyph.get_name ()) has less than three points, it will not be exported."); 			return true; 		} 		@@ -114,8 +109,7 @@ public class GlyfData : GLib.Object { 			} 			last = ep; 		}-		-		warning (@"A path in $(glyph.get_name ()) ($(glyph.get_hex ())) has no area but $(p.points.size) points at $(p.get_first_point ().x),$(p.get_first_point ().y).");+ 		return true; 	} @@ -127,9 +121,26 @@ public class GlyfData : GLib.Object { 		return (int16) paths.size; 	} -	public int16 get_nflags () {+	public uint16 get_nflags () { 		return nflags; 	}++	/** Count off curve points and on curve points.+	 * @return the number of points or uint16.MAX if more than uint16.MAX points where found. +	 */ +	public int get_num_points () {+		int points = 0;+		+		foreach (Path quadratic in paths) {+			points += 2 * quadratic.points.size;+			+			if (points >= uint16.MAX) {+				return uint16.MAX;			+			}+		}+		+		return points;+	}			 	 	void process_end_points () {	 		uint16 last_end_point = 0;@@ -138,6 +149,7 @@ public class GlyfData : GLib.Object { 		end_points.clear (); 		end_point = 0; 		+		int path_number = 0; 		foreach (Path quadratic in paths) { 			if (unlikely (quadratic.points.size == 0)) { 				warning (@"No points in path (before conversion $(quadratic.points.size))");@@ -145,20 +157,26 @@ public class GlyfData : GLib.Object { 			} 			 			if (unlikely (quadratic.points.size < 2)) {-				warning ("A path contains less than three points, it will not be exported.");+				warning ("A path contains less than three points, it will not be exported. Path number: $path_number"); 				continue; 			} 			 			foreach (EditPoint e in quadratic.points) {+				if (unlikely (nflags == uint16.MAX - 1)) {+					warning (@"Too many end points in $(glyph.get_name ())");+					break;				+				}+				 				end_point++; 				type = e.get_right_handle ().type; 				 				// off curve-				end_point++;-				-				if (end_point >= 0xFFFF) {-					warning ("Too many points");+				if (unlikely (nflags == uint16.MAX - 1)) {+					warning (@"Too many end points in $(glyph.get_name ())");+					break;				 				}+				+				end_point++; 			} 			end_points.add (end_point - 1); 			@@ -189,7 +207,13 @@ public class GlyfData : GLib.Object { 				 				// off curve 				flags.add (CoordinateFlags.NONE);-				nflags++;+				+				if (unlikely (nflags == uint16.MAX)) {+					warning (@"Too many flags in $(glyph.get_name ())");+					return;				+				}	+								+				nflags++;				 			} 		} 	}@@ -230,7 +254,7 @@ public class GlyfData : GLib.Object { 		} 	} 	-	bool process_y () {+	void process_y () { 		double prev = 0; 		double y; 		Font font = OpenFontFormatWriter.get_current_font ();@@ -238,6 +262,8 @@ public class GlyfData : GLib.Object { 		int epi = 0; 		 		coordinate_y.clear ();++		int path_number = 0;		 		 		foreach (Path p in paths) { 			foreach (EditPoint e in p.points) {@@ -245,17 +271,8 @@ public class GlyfData : GLib.Object { 				coordinate_y.add ((int16) y); 				 				if ((int16) y == 0 && (int16) coordinate_x.get (coordinate_y.size - 1) == 0) {-					warning (@"Point on point in TTF. Index $(coordinate_y.size - 1)");-					-					// FIXME: distorted shape-					/*-					if (BirdFont.has_argument ("--test")) {-						print (glyph.get_name () + "\n");-						print (points.get (epi).to_string ());-						PenTool.remove_point_simplify (new PointSelection (points.get (epi), p));-						return false;-					}-					*/+					warning (@"Point on point in TTF. Index $(coordinate_y.size - 1) "+						+ @"Path: $path_number in $(glyph.get_name ())"); 				} 				 				prev = rint (e.y * UNITS - font.base_line * UNITS);@@ -265,25 +282,13 @@ public class GlyfData : GLib.Object { 				// off curve 				y = rint (e.get_right_handle ().y * UNITS - prev - font.base_line * UNITS); 				coordinate_y.add ((int16) y);--				if ((int16) y == 0 && (int16) coordinate_x.get (coordinate_y.size - 1) == 0) {-					warning (@"Point on point in TTF (off curve) Index: $(coordinate_y.size - 1) ");-					if (BirdFont.has_argument ("--test")) {-						print (glyph.get_name () + "\n");-						print (points.get (epi).to_string ());-						-						// FIXME: distorted shape-						PenTool.remove_point_simplify (new PointSelection (points.get (epi), p));-						return false;-					}-				} 							 				prev = rint (e.get_right_handle ().y * UNITS - font.base_line  * UNITS); 				epi++; 			}+			+			path_number++; 		}-		-		return true; 	} 	 	void process_bounding_box () {diff --git a/libbirdfont/OpenFontFormat/GlyfTable.vala b/libbirdfont/OpenFontFormat/GlyfTable.valaindex 6d8fbf8..2c908d0 100644--- a/libbirdfont/OpenFontFormat/GlyfTable.vala+++ b/libbirdfont/OpenFontFormat/GlyfTable.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2012 2013 2014 Johan Mattsson+	Copyright (C) 2012, 2013, 2014 Johan Mattsson  	This library is free software; you can redistribute it and/or modify  	it under the terms of the GNU Lesser General Public License as @@ -35,7 +35,7 @@ public class GlyfTable : OtfTable { 	public HeadTable head_table; 	public HmtxTable hmtx_table; 	public LocaTable loca_table;-	public CmapTable cmap_table; // cmap and post is null when inistialized and set in parse method+	public CmapTable cmap_table; // cmap and post is tables are null when initialized and set in parse method 	public PostTable post_table; 	public KernTable kern_table; 	@@ -113,15 +113,17 @@ public class GlyfTable : OtfTable { 		 		foreach (GlyphCollection gc in glyphs) { 			g = gc.get_current ();++			printd (@"adding glyph: $(gc.get_name ())\n");+						 			// set values for loca table 			assert (fd.length () % 4 == 0); 			location_offsets.add (fd.length ()); 			process_glyph (g, fd); -			printd (@"adding glyph: $(g.name)\n"); 			printd (@"glyf length: $(fd.length () - last_len)\n"); 			printd (@"loca fd.length (): $(fd.length ())\n");-+			 			last_len = fd.length (); 		} @@ -144,7 +146,7 @@ public class GlyfTable : OtfTable { 		bool unassigned; 		 		// add notdef character and other special characters first-		glyphs.add (font.get_not_def_character ());+		glyphs.add (font.get_notdef_character ()); 		glyphs.add (font.get_null_character ()); 		glyphs.add (font.get_nonmarking_return ()); 		glyphs.add (font.get_space ());@@ -163,7 +165,7 @@ public class GlyfTable : OtfTable { 			g.remove_empty_paths (); 			unassigned = gc.is_unassigned (); -			if (unassigned && gc.get_name () != ".notdef") {+			if (unassigned) { 				unassigned_glyphs.add (gc); 			} 			@@ -194,13 +196,20 @@ public class GlyfTable : OtfTable { 		foreach (GlyphCollection ug in unassigned_glyphs) { 			glyphs.add (ug); 		}+		+		+		int gid = 0;+		foreach (GlyphCollection ug in glyphs) {+			printd (@"Glyph: $(ug.get_name ()) GID: $(gid)\n");+			gid++;+		} 	}  	public void process_glyph (Glyph g, FontData fd) throws GLib.Error { 		uint16 end_point; 		uint16 npoints; 		int16 ncontours;-		int16 nflags;+		uint16 nflags; 		int glyph_offset; 		uint len;  		uint coordinate_length;@@ -214,6 +223,12 @@ public class GlyfTable : OtfTable { 		 		g.remove_empty_paths (); 		glyf_data = g.get_ttf_data ();+	+		int points = glyf_data.get_num_points ();+		if (unlikely (points >= uint16.MAX)) {+			warning (@"Too many points in glyph $(g.get_name ()) ($points)");+			throw new FileError.FAILED (t_("Too many control points") + " " + t_("in") + @" $(g.get_name ())");+		} 		 		this.glyf_data.add (glyf_data); 		@@ -266,6 +281,7 @@ public class GlyfTable : OtfTable { 		// flags		 		nflags = glyf_data.get_nflags (); 		if (unlikely (nflags != npoints)) {+			print ("glyf table data:\n"); 			fd.dump (); 			warning (@"(nflags != npoints)  ($nflags != $npoints) in glyph $(g.name). ncontours: $ncontours"); 		}@@ -298,18 +314,22 @@ public class GlyfTable : OtfTable {  		// save bounding box for head table 		if (glyf_data.bounding_box_xmin < this.xmin) {+			printd (@"YMin in $(g.get_name ())\n"); 			this.xmin = glyf_data.bounding_box_xmin; 		} 		 		if (glyf_data.bounding_box_ymin < this.ymin) {+			printd (@"YMin in $(g.get_name ())\n"); 			this.ymin = glyf_data.bounding_box_ymin; 		} 		 		if (glyf_data.bounding_box_xmax > this.xmax) {+			printd (@"XMax in $(g.get_name ())\n"); 			this.xmax = glyf_data.bounding_box_xmax; 		} 		 		if (glyf_data.bounding_box_ymax > this.ymax) {+			printd (@"YMax in $(g.get_name ())\n"); 			this.ymax = glyf_data.bounding_box_ymax; 		} 		@@ -477,7 +497,7 @@ public class GlyfTable : OtfTable {  		end_points = new uint16[ncontours + 1]; 		for (int i = 0; i < ncontours; i++) {-			end_points[i] = dis.read_ushort (); // FIXME: mind shot vector is negative+			end_points[i] = dis.read_ushort (); // FIXA: mind shot vector is negative 			 			if (i > 0 && end_points[i] < end_points[i -1]) { 				warning (@"Next endpoint has bad value in $(name.str). (end_points[i] > end_points[i -1])  ($(end_points[i]) > $(end_points[i -1])) i: $i ncontours: $ncontours");diff --git a/libbirdfont/OpenFontFormat/GposTable.vala b/libbirdfont/OpenFontFormat/GposTable.valaindex 31ed992..fa1f223 100644--- a/libbirdfont/OpenFontFormat/GposTable.vala+++ b/libbirdfont/OpenFontFormat/GposTable.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2012, 2013, 2014 Johan Mattsson+	Copyright (C) 2012 2013 2014 2017 Johan Mattsson  	This library is free software; you can redistribute it and/or modify  	it under the terms of the GNU Lesser General Public License as @@ -34,14 +34,14 @@ public class GposTable : OtfTable { 		this.glyf_table = glyf_table; 		this.pairs = new KernList (glyf_table); -		printd ("Process GPOS\n");+		printd ("Processing GPOS\n");  		fd.add_ulong (0x00010000); // table version 		fd.add_ushort (10); // offset to script list 		fd.add_ushort (30); // offset to feature list 		fd.add_ushort (44); // offset to lookup list 		-		// script list ?+		// script list  		fd.add_ushort (1);   // number of items in script list 		fd.add_tag ("DFLT"); // default script 		fd.add_ushort (8);	 // offset to script table from script list@@ -65,33 +65,107 @@ public class GposTable : OtfTable { 		fd.add_ushort (0); // feature prameters (null) 		fd.add_ushort (1); // number of lookups 		fd.add_ushort (0); // lookup index+	+		Gee.ArrayList<FontData> pair_set_data = new Gee.ArrayList<FontData>();		+		pairs.fetch_all_pairs ();+		+		KernSplitter kern_splitter = new KernSplitter (pairs);+		+		while (true) {+			if (offset < 0) {+				break;+			}+			+			KernList pairs_subset = kern_splitter.get_subset (offset);+			+			if (pairs_subset.get_length () == 0) {+				break;+			}+		+			FontData pairs = get_pair_pos_format1 (pairs_subset);+			pair_set_data.add (pairs);+			+			offset += pairs_subset.get_length ();+		}  		 		// lookup table 		fd.add_ushort (1); // number of lookups 		fd.add_ushort (4); // offset to lookup 1 		-		fd.add_ushort (2); // lookup type -		fd.add_ushort (0); // lookup flags-		fd.add_ushort (1); // number of subtables-		fd.add_ushort (8); // array of offsets to subtables+		int16 extention_pos = (int16) (pair_set_data.size * 2); 		-		// MarkFilteringSet +		for (int16 index = 0; index < pair_set_data.size; index++) {+			extention_pos += index * 8;+		}+		+		int64 pair_set_data_length = 0;+		int64 extension_length = 8;+		+		foreach (FontData pair_set in pair_set_data) {+			pair_set_data_length += pair_set.length_with_padding ();+			extension_length += 8;+		}+		+		if (pair_set_data.size > 0) {+			FontData last_pair_set = pair_set_data.get (pair_set_data.size - 1);+			uint64 last_externsion_offset = extension_length + pair_set_data_length; -		fd.append (get_pair_pos_format1 ());+			last_externsion_offset -= 8;+			last_externsion_offset -= last_pair_set.length ();+			+			if (last_externsion_offset > uint32.MAX) {+				warning ("Too manu kerning pairs for the extension positioning table."+					+ @"last_externsion_offset: $last_externsion_offset > "+					+ @"$(uint32.MAX)");+				pair_set_data.clear ();+			}+		}+	+		fd.add_ushort (9); // lookup type +		fd.add_ushort (0); // lookup flags+		fd.add_ushort ((uint16) pair_set_data.size); // number of subtables+			+		if (pair_set_data.size > 0) {+			for (int j = 0; j < pair_set_data.size; j++) {+				uint16 lookup_size = (uint16) pair_set_data.size * 2;+				uint16 offset_to_extension = (uint16) (6 + lookup_size + j * 8);+				fd.add_ushort (offset_to_extension);  // array of offsets to subtables	+			}	+				+			// extension positioning table+			int k = pair_set_data.size - 1;+			while (extension_length > 0 && k >= 0) {+				FontData pair_set = pair_set_data.get (k);+				pair_set_data_length -= pair_set.length ();+				extension_length -= 8;+				+				uint64 externsion_offset = extension_length + pair_set_data_length;+				+				if (externsion_offset > uint32.MAX) {+					warning ("Too manu kerning pairs for extension positioning table.");+				}+				+				fd.add_ushort (1); // format+				fd.add_ushort (2); // lookup type +				fd.add_ulong ((uint32) externsion_offset); // extension offset+				k--;+			}+			+			// MarkFilteringSet ++			foreach (FontData pair_set in pair_set_data) {+				fd.append (pair_set);+			}	+		} 		 		fd.pad ();	 		this.font_data = fd; 	} -	uint16 get_max_pairs () {-		return (uint16) ((uint16.MAX - 10) / 3.0);-	}- 	// PairPosFormat1 subtable-	FontData get_pair_pos_format1 () throws GLib.Error {+	FontData get_pair_pos_format1 (KernList pairs_subset) throws GLib.Error { 		FontData fd = new FontData (); 		uint coverage_offset;-		uint16 max_pairs_per_table = get_max_pairs (); 		uint16 num_pairs; 		int i; 		uint pair_set_offset;@@ -100,26 +174,19 @@ public class GposTable : OtfTable { 		uint last_gid_left; 		uint last_gid_right; 		uint16 pair_set_count;-		-		if (pairs.get_length () == 0) {-			pairs.fetch_all_pairs ();-		}--		// FIXME: add another table instead of truncating it-		if (pairs.get_length () > max_pairs_per_table) {-			warning (@"Too many kerning pairs. $(pairs.get_length ())");-			num_pairs = max_pairs_per_table;-		} -		num_pairs = (pairs.get_length () < max_pairs_per_table) ? -			 (uint16) pairs.get_length () : max_pairs_per_table;+		num_pairs = (uint16) pairs_subset.get_length (); 		-		pair_set_count = (uint16) pairs.get_length_left (); // FIXME: boundaries+		pair_set_count = (uint16) pairs_subset.get_length_left (); // FIXME: boundaries 		-		coverage_offset = 10 + pairs_offset_length () + pairs_set_length ();+		coverage_offset = 10 + pairs_offset_length (pairs_subset) + pairs_set_length (pairs_subset); 		 		if (coverage_offset > uint16.MAX) {-			warning (@"Invalid coverage offset. Number of pairs: $(pairs.get_length ())");+			warning (@"Invalid coverage offset." ++				@"Total: $(pairs.get_length ()), " ++				@"subset: $(pairs_subset.get_length ())" ++				@"coverage_offset: $(coverage_offset) > 65535");+				 			num_pairs = 0; 			coverage_offset = 10; 		}@@ -132,11 +199,11 @@ public class GposTable : OtfTable { 		fd.add_ushort (pair_set_count); // n pairs 		 		// pair offsets orderd by coverage index-		pair_set_offset = 10 + pairs_offset_length ();+		pair_set_offset = 10 + pairs_offset_length (pairs_subset); 		 		written = 0; 		written_pairs = 0;-		pairs.all_pairs_format1 ((k) => {+		pairs_subset.all_pairs_format1 ((k) => { 			try { 				if (pair_set_offset > uint16.MAX) { 					warning ("Invalid offset.");@@ -156,8 +223,8 @@ public class GposTable : OtfTable { 			} 		}, num_pairs); 		-		if (unlikely (written != pairs_offset_length ())) {-			warning (@"Bad pairs_offset_length () calculated: $(pairs_offset_length ()), real length $written");+		if (unlikely (written != pairs_offset_length (pairs_subset))) {+			warning (@"Bad pairs_offset_length () calculated: $(pairs_offset_length (pairs_subset)), real length $written"); 		} 		 		// pair table @@ -165,7 +232,7 @@ public class GposTable : OtfTable { 		written = 0; 		last_gid_left = 0; 		last_gid_right = 0;-		pairs.all_pairs_format1 ((pn) => {+		pairs_subset.all_pairs_format1 ((pn) => { 			try { 				PairFormat1 p = pn; 				uint pairset_length = p.pairs.size;@@ -216,13 +283,13 @@ public class GposTable : OtfTable { 			} 		}, num_pairs); 		-		if (unlikely (pairs_set_length () != written)) {-			warning (@"Bad pair set length: $(pairs_set_length ()), real length: $written");+		if (unlikely (pairs_set_length (pairs_subset) != written)) {+			warning (@"Bad pair set length: $(pairs_set_length (pairs_subset)), real length: $written"); 		} 		 		if (unlikely (fd.length () != coverage_offset)) { 			warning (@"Bad coverage offset, coverage_offset: $coverage_offset, real length: $(fd.length ())");-			warning (@"pairs_offset_length: $(pairs_offset_length ()) pairs_set_length: $(pairs_set_length ())");+			warning (@"pairs_offset_length: $(pairs_offset_length (pairs_subset)) pairs_set_length: $(pairs_set_length (pairs_subset))"); 		} 		 		// coverage@@ -230,7 +297,7 @@ public class GposTable : OtfTable { 		fd.add_ushort (pair_set_count); 		 		written = 0;-		pairs.all_pairs_format1 ((p) => {+		pairs_subset.all_pairs_format1 ((p) => { 			try { 				fd.add_ushort (p.left); // gid 				written += 2;@@ -240,24 +307,24 @@ public class GposTable : OtfTable { 		}, num_pairs); 		 		if (unlikely (written != 2 * pair_set_count)) {-			warning ("written != 2 * pair_set_count");+			warning (@"written != 2 * pair_set_count: $written != 2 * $(pair_set_count)"); 		} 		 		return fd; 	} 	-	public uint pairs_set_length () {+	public static uint pairs_set_length (KernList kerning_list) { 		uint len = 0; 		-		pairs.all_pairs_format1 ((p) => {+		kerning_list.all_pairs_format1 ((p) => { 			len += 2 + 4 * p.pairs.size; 		}); 		 		return len; 	} 	-	public uint pairs_offset_length () {-		return 2 * pairs.pairs.size;+	public static uint pairs_offset_length (KernList kerning_list) {+		return 2 * kerning_list.pairs.size; 	} } diff --git a/libbirdfont/OpenFontFormat/HheaTable.vala b/libbirdfont/OpenFontFormat/HheaTable.valaindex 9fba145..c4e8410 100644--- a/libbirdfont/OpenFontFormat/HheaTable.vala+++ b/libbirdfont/OpenFontFormat/HheaTable.vala@@ -111,7 +111,8 @@ public class HheaTable : OtfTable { 		FontData fd = new FontData (); 		Fixed version = 1 << 16; 		Font font = OpenFontFormatWriter.get_current_font ();-+		int upm, total_height;+		 		fd.add_fixed (version); // table version 		 		ascender = (int16) rint (font.top_limit * HeadTable.UNITS);diff --git a/libbirdfont/OpenFontFormat/HmtxTable.vala b/libbirdfont/OpenFontFormat/HmtxTable.valaindex 10df503..3de46c2 100644--- a/libbirdfont/OpenFontFormat/HmtxTable.vala+++ b/libbirdfont/OpenFontFormat/HmtxTable.vala@@ -161,7 +161,7 @@ public class HmtxTable : OtfTable { 			} 			 			if (extent < 0) {-				warning ("Negative extent.");+				warning (@"Negative extent in $(gc.get_name ())."); 			} 			 			advance_width[nmetrics] = (uint16) extent;diff --git a/libbirdfont/OpenFontFormat/KernList.vala b/libbirdfont/OpenFontFormat/KernList.valaindex 4752a9e..1b9fd6a 100644--- a/libbirdfont/OpenFontFormat/KernList.vala+++ b/libbirdfont/OpenFontFormat/KernList.vala@@ -20,15 +20,15 @@ public class KernList : GLib.Object { 	public delegate void KernIterator (Kern k); 	public delegate void PairFormat1Iterator (PairFormat1 k); -	GlyfTable glyf_table;-	uint num_pairs;+	public GlyfTable glyf_table;+	public uint num_pairs; 	 	public KernList (GlyfTable glyf_table) { 		this.glyf_table = glyf_table; 		num_pairs = 0; 		pairs = new Gee.ArrayList<PairFormat1> ();  	}-	+		 	/** @return number of pairs. */ 	public uint fetch_all_pairs () { 		PairFormat1 current_pairs = new PairFormat1 ();@@ -50,21 +50,37 @@ public class KernList : GLib.Object { 			if (unlikely (kerning_pair.character.get_name () == "")) { 				warning ("No name for glyph"); 			}-+			+			+			string glyph_name = kerning_pair.character.get_name (); 			current_pairs = new PairFormat1 ();-			gid_left = (uint16) glyf_table.get_gid (kerning_pair.character.get_name ());+			gid_left = (uint16) glyf_table.get_gid (glyph_name);++			if (unlikely (gid_left == -1)) {+				warning("Ignoring kerning for missing character: $(glyph_name)");			+				return;+			}		+			 			current_pairs.left = gid_left; 			pairs.add (current_pairs); 			 			if (unlikely (kerning_pair.kerning.size == 0)) {-				warning (@"No kerning pairs for character: $((kerning_pair.character.get_name ()))");+				warning (@"No kerning pairs for character (left): $(glyph_name)"); 			} 			 			i = 0; 			num_pairs += kerning_pair.kerning.size; 			foreach (Kerning k in kerning_pair.kerning) {-				gid_right = (uint16) glyf_table.get_gid (k.get_glyph ().get_name ());-				current_pairs.pairs.add (new Kern (gid_left, gid_right, (int16) Math.rint (k.val * HeadTable.UNITS)));+				string right_name = k.get_glyph ().get_name ();+				gid_right = (uint16) glyf_table.get_gid (right_name);++				if (unlikely (gid_right == -1)) {+					warning("Ignoring kerning for missing character (right): $(right_name)");+				} else {+					int16 kerning_value = (int16) Math.rint (k.val * HeadTable.UNITS);+					Kern kern = new Kern (gid_left, gid_right, kerning_value);+					current_pairs.pairs.add (kern);+				}							 			} 			 			current_pairs.pairs.sort ((a, b) => {@@ -124,6 +140,18 @@ public class KernList : GLib.Object { 			i++; 		} 	}+	+	public void all_single_kern (PairFormat1Iterator iter) {+		foreach (PairFormat1 p in pairs) {+			foreach (Kern k in p.pairs) {+				PairFormat1 single = new PairFormat1 ();+				single.left = p.left;+				single.pairs.add (k);+				+				iter (single);+			}+		}+	} }  }diff --git a/libbirdfont/OpenFontFormat/KernSplitter.vala b/libbirdfont/OpenFontFormat/KernSplitter.valanew file mode 100644index 0000000..03fd50a--- /dev/null+++ b/libbirdfont/OpenFontFormat/KernSplitter.vala@@ -0,0 +1,76 @@+/*+	Copyright (C) 2017 Johan Mattsson++	This library is free software; you can redistribute it and/or modify +	it under the terms of the GNU Lesser General Public License as +	published by the Free Software Foundation; either version 3 of the +	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but +	WITHOUT ANY WARRANTY; without even the implied warranty of +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +	Lesser General Public License for more details.+*/++namespace BirdFont {++public class KernSplitter : GLib.Object {+	public Gee.ArrayList<PairFormat1> pairs;+	private KernList source_list;+	+	public KernSplitter (KernList kerning_list) {+		source_list = kerning_list;+		pairs = new Gee.ArrayList<PairFormat1> (); +		+		kerning_list.all_single_kern((pair) => {+			pairs.add (pair);+		});+	}+	+	/** Prevent integer overflow in coverage table of the PairPos1 subtable. */+	public bool is_full (KernList kerning_pairs) {+		uint length = 10;+		length += GposTable.pairs_offset_length (kerning_pairs);+		length += GposTable.pairs_set_length (kerning_pairs);+		+		return length > (uint16.MAX - 10);+	}+	+	public KernList get_subset (uint offset) {+		int count = 0;+		KernList result = new KernList (source_list.glyf_table);+		+		PairFormat1 current = new PairFormat1 ();+		current.left = 0xFFFF;+		+		for (uint i = offset; i < pairs.size; i++) {+			PairFormat1 next = pairs.get ((int) i);+			+			if (is_full (result)) {+				break;+			}+			+			if (next.left != current.left) {+				current = new PairFormat1 ();+				current.left = next.left;+				result.pairs.add (current);+			}+			+			if (unlikely (next.pairs.size != 1)) {+				warning ("Splitting kerning pairs failed. "+					+ @"next.pairs.size: != $(next.pairs.size)");+			}+			+			current.pairs.add (next.pairs.get (0));+			count++;+		}++		foreach (PairFormat1 kerning in result.pairs) {+ 			result.num_pairs += kerning.pairs.size;+ 		}+		+		return result;+	}+}++}diff --git a/libbirdfont/OpenFontFormat/KerningPair.vala b/libbirdfont/OpenFontFormat/KerningPair.valaindex 2f9dc80..6673a0a 100644--- a/libbirdfont/OpenFontFormat/KerningPair.vala+++ b/libbirdfont/OpenFontFormat/KerningPair.vala@@ -21,8 +21,7 @@ namespace BirdFont { public class KerningPair : GLib.Object { 	public Glyph character; 	public Gee.ArrayList<Kerning> kerning;--	Gee.ArrayList<Glyph> right;+	public Gee.ArrayList<Glyph> right; 	 	public KerningPair (Glyph left) { 		character = left;diff --git a/libbirdfont/OpenFontFormat/OpenFontFormatReader.vala b/libbirdfont/OpenFontFormat/OpenFontFormatReader.valaindex b99f90c..0ed067e 100644--- a/libbirdfont/OpenFontFormat/OpenFontFormatReader.vala+++ b/libbirdfont/OpenFontFormat/OpenFontFormatReader.vala@@ -58,7 +58,7 @@ errordomain BadFormat { 	PARSE } -public class OpenFontFormatReader : GLib.Object {+public class OpenFontFormatReader : Object { 	 	public DirectoryTable directory_table; 	public FontData font_data = new FontData ();diff --git a/libbirdfont/OpenFontFormat/OpenFontFormatWriter.vala b/libbirdfont/OpenFontFormat/OpenFontFormatWriter.valaindex f44ae78..ce6d627 100644--- a/libbirdfont/OpenFontFormat/OpenFontFormatWriter.vala+++ b/libbirdfont/OpenFontFormat/OpenFontFormatWriter.vala@@ -14,7 +14,7 @@  namespace BirdFont { -public class OpenFontFormatWriter : GLib.Object  {+public class OpenFontFormatWriter : Object  {  	DataOutputStream os; 	DataOutputStream os_mac;diff --git a/libbirdfont/OpenFontFormat/OtfInputStream.vala b/libbirdfont/OpenFontFormat/OtfInputStream.valaindex 8256012..ab02b64 100644--- a/libbirdfont/OpenFontFormat/OtfInputStream.vala+++ b/libbirdfont/OpenFontFormat/OtfInputStream.vala@@ -15,7 +15,7 @@ namespace BirdFont {  /** Reader for otf data types. */-public class OtfInputStream : GLib.Object  {+public class OtfInputStream : Object  { 	 	public FileInputStream fin; 	public DataInputStream din;diff --git a/libbirdfont/OpenFontFormat/OtfTable.vala b/libbirdfont/OpenFontFormat/OtfTable.valaindex 56887cb..1a58174 100644--- a/libbirdfont/OpenFontFormat/OtfTable.vala+++ b/libbirdfont/OpenFontFormat/OtfTable.vala@@ -14,7 +14,7 @@  namespace BirdFont { -public class OtfTable : GLib.Object {+public class OtfTable : Object {  	public string id = "NO_ID"; diff --git a/libbirdfont/OpenFontFormat/PostTable.vala b/libbirdfont/OpenFontFormat/PostTable.valaindex 93b3d24..b51def3 100644--- a/libbirdfont/OpenFontFormat/PostTable.vala+++ b/libbirdfont/OpenFontFormat/PostTable.vala@@ -1102,6 +1102,8 @@ public class PostTable : OtfTable { 		assert (names.size == 0); 		add_standard_names (); +		print ("Adding post names\n");+ 		for (int i = 1; i < glyf_table.glyphs.size; i++) { 			gc = glyf_table.glyphs.get (i); 			g = gc.get_current ();diff --git a/libbirdfont/OpenFontFormat/SvgTable.vala b/libbirdfont/OpenFontFormat/SvgTable.valadeleted file mode 100644index 61f93a3..0000000--- a/libbirdfont/OpenFontFormat/SvgTable.vala+++ /dev/null@@ -1,243 +0,0 @@-/*-	Copyright (C) 2015 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using B;--namespace BirdFont {--public class SvgTable : OtfTable {-	-	int glyphs_in_table = 0;-	Gee.ArrayList<SvgTableEntry> entries;--	public SvgTable () {-		id = "SVG ";-		entries = new Gee.ArrayList<SvgTableEntry> ();-	}-	-	public bool has_glyphs () {-		return glyphs_in_table > 0;-	}--	public void process (GlyfTable glyf_table) throws GLib.Error {-		Font font = OpenFontFormatWriter.get_current_font ();-		GlyphCollection? glyph_collection;-		GlyphCollection glyphs;-		int gid;-		Gee.ArrayList<EmbeddedSvg> embedded_svg;-		-		for (int index = 0; index < font.length (); index++) {		-			glyph_collection = font.get_glyph_collection_index (index);-			-			if (glyph_collection != null) {-				glyphs = (!) glyph_collection;-				embedded_svg = get_embedded_svg (glyphs);-				-				if (embedded_svg.size > 0) {-					gid = glyf_table.get_gid (glyphs.get_name ());-					-					StringBuilder svg = new StringBuilder ();-					svg.append ("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");-		-					foreach (EmbeddedSvg embedded in embedded_svg) {-						svg.append ("<svg>");-						svg.append ("\n\n");-						svg.append ("<g id=");-						svg.append ("\"");-						svg.append ("glyph");-						svg.append (@"$gid");-						svg.append ("\" ");-						-						// scale the internal coordinates from 100 units per em to the -						// number of units per em in this font and move the glyph-						// in to the em box-						Glyph glyph = glyphs.get_current ();-						double scale = HeadTable.UNITS;-						double x = embedded.x - glyph.left_limit;-						double y = font.base_line - embedded.y;-						svg.append (@"transform=\"scale($scale) translate($x, $y)\"");-						-						svg.append (">");-						svg.append ("\n\n");--						append_svg_glyph (svg, embedded.svg_data, glyphs);--						svg.append ("\n\n");-						svg.append ("</g>\n");-						svg.append ("</svg>");-					}-					-					SvgTableEntry entry;-					entry = new SvgTableEntry ((uint16) gid, svg.str);-					entries.add (entry);--					glyphs_in_table++;-				}-			}-		}--		process_svg_data ();-	}-	-	Gee.ArrayList<EmbeddedSvg> get_embedded_svg (GlyphCollection glyphs) {-		Gee.ArrayList<EmbeddedSvg> svg = new Gee.ArrayList<EmbeddedSvg> ();-		-		foreach (Object object in glyphs.get_current ().get_visible_objects ()) {-			if (object is EmbeddedSvg) {-				svg.add ((EmbeddedSvg) object);-			}-		}-		-		return svg;-	}-	-	void append_svg_glyph (StringBuilder svg, string svg_data, GlyphCollection glyphs) {-		Gee.ArrayList<Tag> layer_content;-		Gee.ArrayList<Tag> svg_tags;-		Gee.ArrayList<Tag> meta;-		XmlParser xml;-		Tag svg_root_tag;-		Font font;-		-		font = OpenFontFormatWriter.get_current_font ();-		-		layer_content = new Gee.ArrayList<Tag> ();-		svg_tags = new Gee.ArrayList<Tag> ();-		meta = new Gee.ArrayList<Tag> ();-		xml = new XmlParser (svg_data);-		 -		if (!xml.validate ()) {-			warning("Invalid SVG data in TTF table.");-			return;-		}-		-		svg_root_tag = xml.get_root_tag ();-		-		foreach (Tag tag in svg_root_tag) {-			string name = tag.get_name();--			if (name == "defs") {-				svg_tags.add (tag);-			} else if (name == "style") {-				svg_tags.add (tag);-			} else if (name == "metadata") {-				meta.add (tag);-			} else if (name == "sodipodi") {-				meta.add (tag);-			} else {-				layer_content.add (tag);-			}-		}-		-		svg.append ("<");-		svg.append (svg_root_tag.get_name ());-		svg.append (" ");-		append_tag_attributes (svg, svg_root_tag);-		svg.append (">");--		foreach (Tag tag in svg_tags) {-			append_tag (svg, tag);-		}-		-		foreach (Tag tag in layer_content) {-			append_tag (svg, tag);-		}-				-		svg.append ("</");-		svg.append (svg_root_tag.get_name ());-		svg.append (">\n");		-	}--	public void append_tag (StringBuilder svg, Tag tag) {-		string content = tag.get_content ();-		-		svg.append ("<");-		svg.append (tag.get_name ());-		-		svg.append (" ");-		append_tag_attributes (svg, tag);-		-		if (content == "") {-			svg.append (" /");-		}-		-		svg.append (">");-		-		if (content != "") {-			svg.append (content);-			svg.append ("</");-			svg.append (tag.get_name ());-			svg.append (">");-		}-	}-	-	public void append_tag_attributes (StringBuilder svg, Tag tag) {-		bool first = true;-		-		foreach (Attribute attribute in tag.get_attributes ()) {-			string ns = attribute.get_namespace ();-			-			if (!first) {-				svg.append (" ");-			}-						-			if (ns != "") {-				svg.append (ns);-				svg.append (":");-			}-			-			svg.append (attribute.get_name ());-			svg.append ("=");-			svg.append ("\"");-			svg.append (attribute.get_content ());-			svg.append ("\"");-			-			first = false;-		}-	}-	-	public void process_svg_data () throws GLib.Error {-		FontData fd = new FontData ();-		-		int32 svg_index_offset = 10;-		-		fd.add_ushort (0); // version-		fd.add_ulong (svg_index_offset);-		fd.add_ulong (0); // reserved-		-		uint32 document_offset = 2 + 12 * entries.size;-		-		// SVG Documents Index-		fd.add_ushort ((uint16) entries.size);-		-		foreach (SvgTableEntry entry in entries) {-			fd.add_ushort (entry.glyph_id); // start-			fd.add_ushort (entry.glyph_id); // end-			fd.add_ulong (document_offset); // offset-			fd.add_ulong (entry.data.length_with_padding ()); // length--			document_offset += entry.data.length_with_padding ();-		}--		foreach (SvgTableEntry entry in entries) {-			fd.append (entry.data);-		}-			-		fd.pad ();-		-		this.font_data = fd;-	}-}--}diff --git a/libbirdfont/OpenFontFormat/SvgTableEntry.vala b/libbirdfont/OpenFontFormat/SvgTableEntry.valadeleted file mode 100644index 294f969..0000000--- a/libbirdfont/OpenFontFormat/SvgTableEntry.vala+++ /dev/null@@ -1,28 +0,0 @@-/*-	Copyright (C) 2015 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--namespace BirdFont {--public class SvgTableEntry : GLib.Object {-	public FontData data;-	public uint16 glyph_id;-	-	public SvgTableEntry (uint16 gid, string svg) {-		glyph_id = gid;-		data = new FontData ();-		data.add_str (svg);-	}-}--}diff --git a/libbirdfont/OrientationTool.vala b/libbirdfont/OrientationTool.valaindex aa606d2..799cdfc 100644--- a/libbirdfont/OrientationTool.vala+++ b/libbirdfont/OrientationTool.vala@@ -30,11 +30,8 @@ public class OrientationTool : Tool { 		select_action.connect ((self) => { 			Glyph g = MainWindow.get_current_glyph (); 			-			foreach (Object o in g.active_paths) {-				if (o is PathObject) {-					PathObject p = (PathObject) o;-					p.get_path ().reverse ();-				}+			foreach (Path p in g.active_paths) {+				p.reverse (); 			}  			count_down = true;@@ -57,17 +54,13 @@ public class OrientationTool : Tool { 		bool has_clockwise_paths = false; 		bool has_counter_clockwise_paths = false; 		-		foreach (Object o in glyph.active_paths) {-			if (o is PathObject) {-				Path p = ((PathObject) o).get_path ();-				-				if (p.is_clockwise ()) {-					has_clockwise_paths = true;-				}-				-				if (!p.is_clockwise ()) {-					has_counter_clockwise_paths = true;-				}+		foreach (Path p in glyph.active_paths) {+			if (p.is_clockwise ()) {+				has_clockwise_paths = true;+			}+			+			if (!p.is_clockwise ()) {+				has_counter_clockwise_paths = true; 			} 		} 		diff --git a/libbirdfont/OtfFeatureTable.vala b/libbirdfont/OtfFeatureTable.valaindex d12494a..37cbc7a 100644--- a/libbirdfont/OtfFeatureTable.vala+++ b/libbirdfont/OtfFeatureTable.vala@@ -26,7 +26,7 @@ public class OtfFeatureTable : Table { 	static const int REPLACEMENT_GLYPH = 3; 	static const int ALTERNATE_ENTRY = 4; 	-	GlyphCollection glyph_collection;+	GlyphCollection? glyph_collection = null; 	GlyphCollection? replacement_glyph = null; 	string alternate_name = ""; 	TextListener listener;@@ -34,26 +34,47 @@ public class OtfFeatureTable : Table { 	Gee.ArrayList<AlternateItem> undo_items; 	// FIXME: implement redo 	-	public OtfFeatureTable (GlyphCollection gc) {+	bool ignore_input = false;+	+	public OtfFeatureTable (GlyphCollection? gc) { 		glyph_collection = gc; 		undo_items = new Gee.ArrayList<AlternateItem> (); 	} +	public override void selected_canvas () {+		ignore_input = true; // make sure that tripple clicks in overview are ignored++		TimeoutSource input_delay = new TimeoutSource (250);+		input_delay.set_callback(() => {+			ignore_input = false;+			return false;+		});+		input_delay.attach (null);+		+		base.selected_canvas ();+	}+ 	public override Gee.ArrayList<Row> get_rows () { 		return rows; 	}  	public override void selected_row (Row row, int column, bool delete_button) { 		int row_index = row.get_index ();-		GLib.Object o;+		Object o; 		String s; 		AlternateItem a; 		+		if (ignore_input) {+			return;+		}+		 		if (row_index == SOURCE_GLYPH) { 			GlyphSelection gs = new GlyphSelection (); 			 			gs.selected_glyph.connect ((gc) => {-				glyph_collection = gc;		+				glyph_collection = gc;+				replacement_glyph = null;+				Tool.yield ();		 				MainWindow.get_tab_bar ().select_tab_name (get_name ()); 			}); 			@@ -62,7 +83,8 @@ public class OtfFeatureTable : Table { 			GlyphSelection gs = new GlyphSelection (); 			 			gs.selected_glyph.connect ((gc) => {-				replacement_glyph = gc;		+				replacement_glyph = gc;+				Tool.yield ();		 				MainWindow.get_tab_bar ().select_tab_name (get_name ()); 			}); 			@@ -102,7 +124,15 @@ public class OtfFeatureTable : Table { 		row = new Row.headline (t_("Glyph Substitutions")); 		rows.add (row); 		-		row = new Row.columns_1 (t_("Glyph") + ": " + glyph_collection.get_name (), SOURCE_GLYPH, false);+		string glyph = "";+		+		if (glyph_collection == null) {+			glyph = t_("New glyph");+		} else {+			glyph = ((!) glyph_collection).get_name ();+		}+		+		row = new Row.columns_1 (t_("Glyph") + ": " + glyph, SOURCE_GLYPH, false); 		rows.add (row); 		 		string replacement = t_("New glyph");@@ -176,7 +206,14 @@ public class OtfFeatureTable : Table { 	}	  	public void add_new_alternate (string tag) {-		GlyphCollection gc = glyph_collection;+		GlyphCollection gc;+		+		if (glyph_collection == null) {+			MainWindow.show_message (t_("Select a glyph to create an alternate for."));+			return;+		}+		+		gc = (!) glyph_collection; 		 		listener = new TextListener (t_("Glyph name"), "", t_("Add")); 		@@ -190,19 +227,15 @@ public class OtfFeatureTable : Table { 			OverView overview = MainWindow.get_overview (); 			 			font = BirdFont.get_current_font ();-			-			if (alternate_name == "" || gc.is_unassigned ()) {-				MainWindow.tabs.close_display (this);-				return;-			}-			+ 			if (font.glyph_name.has_key (alternate_name)) { 				MainWindow.show_message (t_("All glyphs must have unique names.")); 			} else { 				alt = new GlyphCollection.with_glyph ('\0', alternate_name); 				alt.set_unassigned (true); 				font.add_new_alternate (gc, alt, tag);-				MainWindow.tabs.close_display (this);+				update_rows ();+				GlyphCanvas.redraw (); 				MainWindow.get_overview ().update_item_list (); 				overview.open_glyph_signal (alt); 			}@@ -212,7 +245,8 @@ public class OtfFeatureTable : Table { 			GlyphCollection replacement = (!) replacement_glyph; 			Font f = BirdFont.get_current_font (); 			f.add_alternate (gc.get_name (), replacement.get_name (), tag);-			MainWindow.tabs.close_display (this);+			update_rows ();+			GlyphCanvas.redraw (); 		} else { 			TabContent.show_text_input (listener); 		}		diff --git a/libbirdfont/OverView.vala b/libbirdfont/OverView.valaindex ce453dd..02861ff 100644--- a/libbirdfont/OverView.vala+++ b/libbirdfont/OverView.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2012 2014 2015 Johan Mattsson+	Copyright (C) 2012 - 2016 Johan Mattsson  	This library is free software; you can redistribute it and/or modify  	it under the terms of the GNU Lesser General Public License as @@ -13,7 +13,6 @@ */  using Cairo;-using SvgBird;  namespace BirdFont { @@ -51,7 +50,7 @@ public class OverView : FontDisplay { 	 	string search_query = ""; 	-	Gee.ArrayList<OverViewItem> visible_items = new Gee.ArrayList<OverViewItem> ();+	public Gee.ArrayList<OverViewItem> visible_items = new Gee.ArrayList<OverViewItem> (); 	 	/** List of undo commands. */ 	public Gee.ArrayList<OverViewUndoItem> undo_items = new Gee.ArrayList<OverViewUndoItem> ();@@ -94,23 +93,15 @@ public class OverView : FontDisplay { 				TabBar tabs = MainWindow.get_tab_bar (); 				string n = glyph_collection.get_current ().name; 				bool selected = tabs.select_char (n);-				GlyphCanvas canvas; 				Glyph g = glyph_collection.get_current (); +				GlyphTab glyph_tab; 				 				if (!selected) {-					canvas = MainWindow.get_glyph_canvas ();-					tabs.add_tab (g, true, glyph_collection);-					canvas.set_current_glyph_collection (glyph_collection);-					set_initial_zoom ();+					glyph_tab = new GlyphTab (glyph_collection);+					tabs.add_tab (glyph_tab, true, glyph_collection);+					set_glyph_zoom (glyph_collection); 					PenTool.update_orientation (); 				}-				-				if (glyph_collection.get_name () == ".notdef") {-					Font font = BirdFont.get_current_font ();-					if (!font.has_glyph (".notdef")) {-						font.add_glyph_collection (glyph_collection);-					}-				} 			});  			this.open_new_glyph_signal.connect ((character) => {@@ -126,7 +117,7 @@ public class OverView : FontDisplay { 		if (default_character_set) { 			IdleSource idle = new IdleSource (); -			idle.set_callback (() => {			+			idle.set_callback (() => { 				use_default_character_set (); 				selected_canvas (); 				return false;@@ -138,6 +129,16 @@ public class OverView : FontDisplay { 		update_item_list (); 		update_scrollbar (); 		reset_zoom ();+		+		string? zoom = Preferences.get ("overview_zoom");+		+		if (zoom != null) {+			string z = (!) zoom;+			+			if (z != "") {+				set_zoom (double.parse (z));+			}			+		} 	}  	public Glyph? get_selected_glyph () {@@ -184,6 +185,7 @@ public class OverView : FontDisplay { 		Glyph glyph; 		GlyphCollection glyph_collection; 		GlyphCanvas canvas;+		GlyphTab glyph_tab;  		 		glyph_collection = MainWindow.get_current_glyph_collection (); 		name.append_unichar (character);@@ -191,17 +193,17 @@ public class OverView : FontDisplay { 				 		if (!selected) { 			glyph_collection = add_character_to_font (character);-			+			glyph_tab = new GlyphTab (glyph_collection); 			glyph = glyph_collection.get_current (); 			glyph.layers.add_layer (new Layer ());-			tabs.add_tab (glyph, true, glyph_collection);+			tabs.add_tab (glyph_tab, true, glyph_collection); 			 			selected_items.add (glyph_collection); 			 			canvas = MainWindow.get_glyph_canvas (); 			canvas.set_current_glyph_collection (glyph_collection); 			-			set_initial_zoom ();+			set_glyph_zoom (glyph_collection); 		} else { 			warning ("Glyph is already open"); 		}@@ -289,15 +291,18 @@ public class OverView : FontDisplay { 		return null; 	} 	-	public void set_initial_zoom () {+	public void set_glyph_zoom (GlyphCollection glyphs) {+		GlyphCanvas canvas;+		canvas = MainWindow.get_glyph_canvas ();+		canvas.set_current_glyph_collection (glyphs); 		Toolbox tools = MainWindow.get_toolbox (); 		ZoomTool z = (ZoomTool) tools.get_tool ("zoom_tool"); 		z.store_current_view ();-		MainWindow.get_current_glyph ().default_zoom ();+		glyphs.get_current ().default_zoom (); 		z.store_current_view (); 		OverViewItem.reset_label (); 	}-+	 	public double get_height () { 		double l; 		Font f;@@ -395,6 +400,7 @@ public class OverView : FontDisplay { 		KeyBindings.set_require_modifier (true); 		update_scrollbar (); 		update_zoom_bar ();+		OverViewItem.glyph_scale = 1; 		update_item_list (); 		selected_item = get_selected_item (); 		GlyphCanvas.redraw ();@@ -415,7 +421,17 @@ public class OverView : FontDisplay { 		OverViewItem.margin = OverViewItem.DEFAULT_MARGIN * z; 		update_item_list (); 		OverViewItem.reset_label ();-		GlyphCanvas.redraw ();	+		Preferences.set ("overview_zoom", @"$zoom");++		Font font = BirdFont.get_current_font ();+		for (int index = 0; index < font.length (); index++) {+			GlyphCollection? glyphs = font.get_glyph_collection_index ((uint32) index);+			return_if_fail (glyphs != null);+			GlyphCollection g = (!) glyphs;+			g.get_current ().overview_thumbnail = null;+		}+		+		GlyphCanvas.redraw (); 	} 	 	public override void zoom_min () {@@ -504,7 +520,9 @@ public class OverView : FontDisplay { 			return selected_item; 		} -		return visible_items.get (selected);+		OverViewItem item = visible_items.get (selected);+		item.selected = true;+		return item; 	} 	 	int get_items_per_row () {@@ -527,7 +545,7 @@ public class OverView : FontDisplay { 	 	public void process_item_list_update () { 		string character_string;-		Font font = BirdFont.get_current_font ();+		Font f = BirdFont.get_current_font (); 		GlyphCollection? glyphs = null; 		uint32 index; 		OverViewItem item;@@ -551,11 +569,10 @@ public class OverView : FontDisplay { 		y = OverViewItem.margin; 		 		if (all_available) {-			uint font_length = font.length ();-			int i;+			uint font_length = f.length (); 			-			for (i = 0; i < item_list_length && index < font_length; i++) {-				glyphs = font.get_glyph_collection_index ((uint32) index);+			for (int i = 0; i < item_list_length && index < font_length; i++) {+				glyphs = f.get_glyph_collection_index ((uint32) index); 				return_if_fail (glyphs != null); 				 				glyph = ((!) glyphs).get_current ();@@ -565,21 +582,11 @@ public class OverView : FontDisplay { 				item = new OverViewItem (); 				item.set_character (character); 				item.set_glyphs (glyphs);-				item.generate_graphics ();-				item.selected = (selected_items.index_of ((!) glyphs) != -1);-				+				item.x = x;+				item.y = y; 				visible_items.add (item); 				index++; 			}-			-			if (i < item_list_length && !font.has_glyph (".notdef")) {-				item = new OverViewItem ();-				item.set_glyphs (font.get_not_def_character ());-				item.generate_graphics (false);-				item.version_menu = null;-				item.selected = (selected_items.index_of ((!) glyphs) != -1);-				visible_items.add (item);-			} 		} else { 			uint32 glyph_range_size = glyph_range.get_length (); 			@@ -606,17 +613,8 @@ public class OverView : FontDisplay { 			visible_size = visible_items.size; 			for (int i = 0; i < visible_size; i++) { 				item = visible_items.get (i);-				glyphs = font.get_glyph_collection_by_name ((!) item.character.to_string ());+				glyphs = f.get_glyph_collection_by_name ((!) item.character.to_string ()); 				item.set_glyphs (glyphs);-				-				if (glyphs != null) {-					item.selected = (selected_items.index_of ((!) glyphs) != -1);-				}-			}--			for (int i = 0; i < visible_size; i++) {-				item = visible_items.get (i);-				item.generate_graphics (); 			} 		} 		@@ -624,17 +622,31 @@ public class OverView : FontDisplay { 		y = OverViewItem.margin; 		 		visible_size = visible_items.size;+		int selected_index;+		bool selected_item; 		double full_width = OverViewItem.full_width (); 		 		for (int i = 0; i < visible_size; i++) { 			item = visible_items.get (i); -			if (item.glyphs == null) {-				item.selected |= (i == selected);+			selected_item = false;+	+			if (all_available) {+				glyphs = f.get_glyph_collection_index ((uint32) i);+			} else {			+				glyphs = f.get_glyph_collection_by_name ((!) item.character.to_string ());+			}+			+			if (glyphs != null) {+				selected_index = selected_items.index_of ((!) glyphs);+				selected_item = (selected_index != -1); 			} 			 			item.adjust_scale (); 			+			selected_item |= (i == selected);+			item.selected = selected_item;+			 			item.x = x + view_offset_x; 			item.y = y + view_offset_y; 			@@ -682,8 +694,9 @@ public class OverView : FontDisplay { 		 	void draw_empty_canvas (WidgetAllocation allocation, Context cr) { 		Text t;+		 		cr.save ();-		t = new Text ("No glyphs in this view.", 24);+		t = new Text (t_("No glyphs in this view."), 24); 		Theme.text_color (t, "Text Foreground"); 		t.widget_x = 40; 		t.widget_y = 30;@@ -1035,8 +1048,10 @@ public class OverView : FontDisplay { 		} 		store_undo_items (undo_item); -		foreach (GlyphCollection gc in selected_items) {-			font.delete_glyph (gc);+		foreach (GlyphCollection glyph_collection in selected_items) {+			font.delete_glyph (glyph_collection);+			string name = glyph_collection.get_name ();+			MainWindow.get_tab_bar ().close_background_tab_by_name (name); 		}  		update_item_list ();@@ -1061,12 +1076,23 @@ public class OverView : FontDisplay { 			if (g.length () > 0) { 				font.add_glyph_collection (g); 			}++			TabBar tabs = MainWindow.get_tab_bar ();+			Tab? tab = tabs.get_tab (g.get_name ());+			+			if (tab != null) {+				Tab t = (!) tab;+				set_glyph_zoom (g);+				t.set_glyph_collection (g);+				t.set_display (new GlyphTab (g));+			} 		} 		 		Font f = BirdFont.get_current_font (); 		f.alternates = previous_collection.alternate_sets.copy ();  		undo_items.remove_at (undo_items.size - 1);+		update_item_list (); 		GlyphCanvas.redraw (); 	} 	@@ -1085,8 +1111,17 @@ public class OverView : FontDisplay { 		foreach (GlyphCollection g in previous_collection.glyphs) { 			font.delete_glyph (g); 			font.add_glyph_collection (g);++			TabBar tabs = MainWindow.get_tab_bar ();+			Tab? tab = tabs.get_tab (g.get_name ());+			+			if (tab != null) {+				Tab t = (!) tab;+				set_glyph_zoom (g);+				t.set_glyph_collection (g);+				t.set_display (new GlyphTab (g));+			} 		}-		 		font.alternates = previous_collection.alternate_sets.copy ();  		redo_items.remove_at (redo_items.size - 1);@@ -1133,6 +1168,15 @@ public class OverView : FontDisplay { 			if (o.get_name () == name) { 				selected = i; 				selected_item = get_selected_item ();++				if (selected_item.y > allocation.height - OverViewItem.height) {+					view_offset_y -= (selected_item.y + OverViewItem.height) - allocation.height;+				}++				if (selected_item.y < 0) {+					view_offset_y = 0;+				}		+ 				return true; 			} 			@@ -1183,12 +1227,12 @@ public class OverView : FontDisplay { 		if (all_available) { 			 			// don't search for glyphs in huge CJK fonts -			if (font.length () > 300) {+			if (font.length () > 500) { 				r = 0; 			} else { 				// FIXME: too slow 				for (r = 0; r < font.length (); r += items_per_row) {-					for (i = 0; i < items_per_row; i++) {+					for (i = 0; i < items_per_row && i < font.length (); i++) { 						glyphs = font.get_glyph_collection_index ((uint32) r + i); 						return_if_fail (glyphs != null); 						glyph = ((!) glyphs).get_current ();@@ -1225,6 +1269,7 @@ public class OverView : FontDisplay { 		 		if (index > -1) { 			first_visible = r;+			process_item_list_update (); 			update_item_list (); 			select_visible_glyph (ch); 		}@@ -1245,9 +1290,12 @@ public class OverView : FontDisplay { 	}  	public void open_overview_item (OverViewItem i) {+		return_if_fail (!is_null (i));+		 		if (i.glyphs != null) { 			open_glyph_signal ((!) i.glyphs);-			((!) i.glyphs).get_current ().close_path ();+			GlyphCollection gc = (!) i.glyphs;+			gc.get_current ().close_path (); 		} else { 			open_new_glyph_signal (i.character); 		}@@ -1296,6 +1344,10 @@ public class OverView : FontDisplay { 			return; 		} 		+		if (!KeyBindings.has_shift ()) {+			selected_items.clear ();+		}+		 		for (int j = 0; j < visible_items.size; j++) { 			i = visible_items.get (j); 			@@ -1305,6 +1357,7 @@ public class OverView : FontDisplay { 				 				if (KeyBindings.has_shift ()) { 					if (selected_item.glyphs != null) {+						 						selected_index = selected_items.index_of ((!) selected_item.glyphs); 						if (selected_index == -1) { 							selected_items.add ((!) selected_item.glyphs);@@ -1315,8 +1368,6 @@ public class OverView : FontDisplay { 							selected_item = get_selected_item (); 						} 					}-					-					update = true; 				} else { 					selected_items.clear (); 					if (selected_item.glyphs != null) {@@ -1324,16 +1375,15 @@ public class OverView : FontDisplay { 					} 				} 				-				if (is_null(i.version_menu)) {-					update = true;+				if (!is_null (i.version_menu)) {+					update = !((!)i).version_menu.menu_visible; 				} else {-					VersionList v = (!) i.version_menu;-					update = !v.menu_visible;+					update = true; 				} 			} 			index++; 		}-+	 		if (update) { 			update_item_list (); 		}@@ -1379,7 +1429,20 @@ public class OverView : FontDisplay { 	} 	 	public void open_current_glyph () {-		open_overview_item (selected_item);+		// keep this object even if open_glyph_signal closes the display+		this.ref ();+		 +		selected_item = get_selected_item ();+		if (selected_item.glyphs != null) {+			open_glyph_signal ((!) selected_item.glyphs);+			GlyphCollection? gc2 = selected_item.glyphs;+			GlyphCollection gc = (!) selected_item.glyphs;+			gc.get_current ().close_path ();+		} else {+			open_new_glyph_signal (selected_item.character);+		}+		+		this.unref (); 	}  	public override void update_scrollbar () {@@ -1432,6 +1495,7 @@ public class OverView : FontDisplay { 		double character_height; 		 		entry = ((!)character_info).get_entry ();+ 		lines = entry.split ("\n"); 		 		foreach (string line in entry.split ("\n")) {@@ -1511,6 +1575,7 @@ public class OverView : FontDisplay { 			 			character_start = y + 10 + i * UCD_LINE_HEIGHT; 			character_height = h - character_start;+ 			draw_fallback_character (cr, x, character_start, character_height); 		} 	}@@ -1519,7 +1584,11 @@ public class OverView : FontDisplay { 	void draw_fallback_character (Context cr, double x, double y, double height) 	requires (character_info != null) { 		unichar c = ((!)character_info).unicode;-		++		if (height < 0) {+			return;+		}+ 		cr.save (); 		Text character = new Text (); 		character.set_use_cache (false);@@ -1644,6 +1713,13 @@ public class OverView : FontDisplay { 		} 		 		f.touch ();+		+		update_item_list ();+		GlyphCanvas.redraw ();+	}++	public override bool needs_modifier () {+		return true; 	} 	 	public class OverViewUndoItem {diff --git a/libbirdfont/OverViewItem.vala b/libbirdfont/OverViewItem.valaindex 549d969..cbd3b18 100644--- a/libbirdfont/OverViewItem.vala+++ b/libbirdfont/OverViewItem.vala@@ -25,11 +25,7 @@ public class OverViewItem : GLib.Object { 	public GlyphCollection? glyphs; 	public double x; 	public double y;-	-	public bool selected {-		get; set;-	}-	+	public bool selected = false; 	public CharacterInfo info; 		 	public static double DEFAULT_WIDTH = 100;@@ -42,7 +38,7 @@ public class OverViewItem : GLib.Object {  	public static double glyph_scale = 1.0; 	-	public VersionList? version_menu = null;+	public VersionList version_menu; 	Text label; 	 	private Surface? cache = null;@@ -60,25 +56,20 @@ public class OverViewItem : GLib.Object { 	} 	 	public void set_glyphs (GlyphCollection? gc) {-		glyphs = gc;		-	}--	public void generate_graphics (bool generate_versions = true) {-		if (glyphs != null && generate_versions) {-			VersionList versions = new VersionList ((!) glyphs);-			-			versions.add_glyph_item.connect ((glyph) => {+		glyphs = gc;+		+		if (glyphs != null) {	+			version_menu = new VersionList ((!) glyphs);+			version_menu.add_glyph_item.connect ((glyph) => { 				((!) glyphs).insert_glyph (glyph, true); 			}); 			-			versions.signal_delete_item.connect ((glyph_index) => {+			version_menu.signal_delete_item.connect ((glyph_index) => { 				OverView v = MainWindow.get_overview (); 				version_menu = new VersionList ((!) glyphs); 				v.update_item_list (); 				GlyphCanvas.redraw (); 			});-			-			version_menu = versions; 		}	  		info = new CharacterInfo (character, glyphs);@@ -90,7 +81,16 @@ public class OverViewItem : GLib.Object { 			truncate_label (); 		} 		-		draw_background ();	+		draw_background ();		+	}++	public void clear_cache () {+		cache = null;+		+		if (glyphs != null) {+			Glyph g = ((!) glyphs).get_current ();+			g.overview_thumbnail = null;+		} 	}  	public void draw_glyph_from_font () {@@ -99,6 +99,7 @@ public class OverViewItem : GLib.Object { 		} 		 		Glyph g;+		Font font; 		double gx, gy; 		double x1, x2, y1, y2; 		double scale_box;@@ -106,17 +107,18 @@ public class OverViewItem : GLib.Object { 		double glyph_width, glyph_height; 		Surface s; 		Context c;+		Color color = Color.black (); 		 		g = ((!) glyphs).get_current (); 		-		if (g.overview_thumbnail != null) {+		if (likely (g.overview_thumbnail != null)) { 			cache = g.overview_thumbnail; 			return; 		}-+		 		w = width; 		h = height;-+		 		scale_box = width / DEFAULT_WIDTH;  		s = Screen.create_background_surface ((int) width, (int) height - 20);@@ -124,37 +126,51 @@ public class OverViewItem : GLib.Object { 		 		c.save (); 		g.boundaries (out x1, out y1, out x2, out y2);-+	 		glyph_width = x2 - x1; 		glyph_height = y2 - y1;-+		 		c.save (); 		c.scale (glyph_scale * Screen.get_scale (), glyph_scale * Screen.get_scale ());  		g.add_help_lines ();-				+		 		gx = ((w / glyph_scale) - glyph_width) / 2 - g.get_left_side_bearing (); 		gy = (h / glyph_scale) - 25 / glyph_scale;+		 		c.translate (gx - Glyph.xc () - g.get_lsb (), g.get_baseline () + gy - Glyph.yc ());-		g.draw_layers (c); 		+		g.draw_paths (c, color); 		c.restore (); 		 		cache = s;+		g.overview_thumbnail = s;+		 		GlyphCanvas.redraw (); 	}  	public void draw_background () {+		Glyph g;+		Font font;+		double gx, gy;+		double x1, x2, y1, y2; 		double scale_box;+		double w, h;+		double glyph_width, glyph_height; 		Surface s; 		Context c;-+		Color color = Color.black ();+		+		w = width;+		h = height;+		 		scale_box = width / DEFAULT_WIDTH;+		adjust_scale ();  		s = Screen.create_background_surface ((int) width, (int) height - 20); 		c = new Context (s); 		-		if (glyphs != null) {+		if (glyphs != null) { // FIXME: lock 			draw_glyph_from_font (); 		} else { 			c.scale (Screen.get_scale (), Screen.get_scale ());@@ -211,6 +227,10 @@ public class OverViewItem : GLib.Object { 		return s.str; 	} 	+	public void set_selected (bool s) {+		selected = s;+	}+	 	public static double full_width () { 		return width + margin; 	}@@ -224,17 +244,16 @@ public class OverViewItem : GLib.Object { 		GlyphCollection g; 		bool s = (x <= px <= x + width) && (y <= py <= y + height); -		if (has_icons () && glyphs != null && version_menu != null) {+		if (has_icons () && glyphs != null) { 			g = (!) glyphs;-			VersionList versions = (!) version_menu;-			versions.set_position (x + width - 21, y + height - 18);-			a = versions.menu_item_action (px, py); // select one item on the menu+			version_menu.set_position (x + width - 21, y + height - 18);+			a = version_menu.menu_item_action (px, py); // select one item on the menu 			 			if (a) { 				return s; 			} 			-			versions.menu_icon_action (px, py); // click in the open menu+			version_menu.menu_icon_action (px, py); // click in the open menu 		} 		 		info.set_position (x + width - 17, y + height - 22.5);@@ -271,8 +290,9 @@ public class OverViewItem : GLib.Object { 		cr.set_line_width (1); 		cr.stroke (); 		cr.restore ();-	-		draw_thumbnail (cr, x, y + height);	+		+		draw_thumbnail (cr, x, y + height);+		 		draw_caption (cr); 		draw_menu (cr); 	}@@ -285,22 +305,21 @@ public class OverViewItem : GLib.Object { 		if (glyphs != null) { 			font = BirdFont.get_current_font (); 			g = ((!) glyphs).get_current ();-			-			if (g.boundaries (out x1, out y1, out x2, out y2)) {-				glyph_width = x2 - x1;-				glyph_height = y2 - y1;+			g.boundaries (out x1, out y1, out x2, out y2);+		+			glyph_width = x2 - x1;+			glyph_height = y2 - y1; -				if (glyph_scale == 1) {-					// caption height is 20-					glyph_scale = (height - 20) / (font.top_limit - font.bottom_limit);	-				}-				-				scale = glyph_scale;			-				gx = ((width / scale) - glyph_width) / 2;+			if (glyph_scale == 1) {+				// caption height is 20+				glyph_scale = (height - 20) / (font.top_limit - font.bottom_limit);	+			} 			-				if (gx < 0) {-					glyph_scale = 1 + 2 * gx / width;-				}+			scale = glyph_scale;			+			gx = ((width / scale) - glyph_width) / 2;+		+			if (gx < 0) {+				glyph_scale = 1 + 2 * gx / width; 			} 		} 	}@@ -356,10 +375,7 @@ public class OverViewItem : GLib.Object { 		cc.fill (); 		 		if (has_icons ()) {-			if (version_menu != null) { -				draw_menu_icon (cc, false);-			}-			+			draw_menu_icon (cc, false); 			draw_character_info_icon (cc); 		} @@ -418,10 +434,6 @@ public class OverViewItem : GLib.Object { 		return glyphs != null; 	} 	-	public void clear_cache () {-		cache = null;-	}-	 	public void draw_label_background (Context cr) { 		Surface cache; 		bool icon;@@ -456,8 +468,7 @@ public class OverViewItem : GLib.Object { 	 	public void hide_menu () { 		if (!is_null (version_menu)) {-			VersionList v = (!) version_menu;-			v.menu_visible = false;+			version_menu.menu_visible = false; 		} 	} 	@@ -477,21 +488,11 @@ public class OverViewItem : GLib.Object { 	} 	 	private void draw_menu (Context cr) {-		if (glyphs == null) {-			return;-		}--		if (version_menu == null) {-			return;-		}-		-		VersionList v = (!) version_menu;-		 -		if (!v.menu_visible) {+		if (likely (glyphs == null || !version_menu.menu_visible)) { 			return; 		} 		-		v.draw_menu (cr);+		version_menu.draw_menu (cr); 	} } diff --git a/libbirdfont/OverviewTools.vala b/libbirdfont/OverviewTools.valaindex 0c44523..978f578 100644--- a/libbirdfont/OverviewTools.vala+++ b/libbirdfont/OverviewTools.vala@@ -16,6 +16,11 @@ using Cairo;  namespace BirdFont { +public enum Transform {+	SLANT,+	SIZE+}+ public class OverviewTools : ToolCollection  {  	static LabelTool all_glyphs;@@ -38,7 +43,8 @@ public class OverviewTools : ToolCollection  { 		Expander font_name = new Expander (); 		Expander character_sets = new Expander (t_("Character Sets")); 		Expander zoom_expander = new Expander (t_("Zoom"));-		Expander transform_expander = new Expander (t_("Transform"));+		Expander transform_slant_expander = new Expander (t_("Transform"));+		Expander transform_size_expander = new Expander (); 		Expander glyph_expander = new Expander (t_("Glyph")); 		Expander multi_master = new Expander (t_("Multi-Master")); 		@@ -93,44 +99,72 @@ public class OverviewTools : ToolCollection  { 		skew = new SpinButton ("skew_overview", t_("Skew")); 		skew.set_big_number (true); 		skew.set_int_value ("0.000");++		FontSettings settings = BirdFont.get_current_font ().settings;			+		string? skew_value = settings.get_setting ("skew_overview");++		if (skew_value != null) {+			skew.set_int_value ((!) skew_value);+		}+ 		skew.set_int_step (1); 		skew.set_min (-100); 		skew.set_max (100); 		skew.show_icon (true); 		skew.set_persistent (false);-		skew.new_value_action.connect ((self) => {-			resize.set_value_round (100, false, false);+		transform_slant_expander.add_tool (skew);+			+		Tool transform_slant = new Tool ("transform_slant", t_("Transform"));+		transform_slant.set_icon ("transform");+		transform_slant.select_action.connect ((self) => {+			FontSettings fs = BirdFont.get_current_font ().settings;			+			fs.set_setting ("skew_overview", @"$(skew.get_value ())");+			transform_slant.selected = false;+			+			process_transform (Transform.SLANT);+			+			BirdFont.get_current_font ().touch (); 		});-		transform_expander.add_tool (skew);+		transform_slant.selected = false;+		transform_slant.set_persistent (false);+		transform_slant_expander.add_tool (transform_slant);  		resize = new SpinButton ("resize_overview", t_("Resize")); 		resize.set_big_number (true);-		resize.set_int_value ("0.000");+		resize.set_int_value ("100.0");+					+		string? resize_value = settings.get_setting ("resize_overview");++		if (resize_value != null) {+			resize.set_int_value ((!) resize_value);+			+			if (resize.get_value () <= 0) {+				resize.set_int_value ("100.0");+			}+		}+ 		resize.set_int_step (1); 		resize.set_min (0); 		resize.set_max (300); 		resize.show_icon (true); 		resize.set_persistent (false);-		resize.new_value_action.connect ((self) => {-			skew.set_value_round (0, false, false);-		});-		transform_expander.add_tool (resize);-			-		Tool transform = new Tool ("transform", t_("Transform"));-		transform.select_action.connect ((self) => {-			FontSettings fs = BirdFont.get_current_font ().settings;-			-			fs.set_setting ("skew_overview", @"$(skew.get_value ())");-			transform.selected = false;+		transform_size_expander.add_tool (resize);++		Tool transform_size = new Tool ("transform_size", t_("Transform"));+		transform_size.set_icon ("transform");+		transform_size.select_action.connect ((self) => {+			FontSettings fs = BirdFont.get_current_font ().settings;			+			fs.set_setting ("resize_overview", @"$(resize.get_value ())");+			transform_size.selected = false; 			-			process_transform ();+			process_transform (Transform.SIZE); 			 			BirdFont.get_current_font ().touch (); 		});-		transform.selected = false;-		transform.set_persistent (false);-		transform_expander.add_tool (transform);-		+		transform_size.selected = false;+		transform_size.set_persistent (false);+		transform_size_expander.add_tool (transform_size);+ 		Tool alternate = new Tool ("alternate", t_("Create alternate")); 		alternate.select_action.connect (add_new_alternate); 		glyph_expander.add_tool (alternate);@@ -179,7 +213,8 @@ public class OverviewTools : ToolCollection  { 		expanders.add (font_name); 		expanders.add (zoom_expander); 		expanders.add (character_sets);-		expanders.add (transform_expander);+		expanders.add (transform_slant_expander);+		expanders.add (transform_size_expander); 		expanders.add (glyph_expander); 		 		if (BirdFont.has_argument ("--test")) {@@ -244,19 +279,20 @@ public class OverviewTools : ToolCollection  { 	public void add_new_alternate (Tool tool) { 		OverView o = MainWindow.get_overview (); 		OverViewItem oi = o.selected_item;-		GlyphCollection gc;+		GlyphCollection? gc; 		 		tool.set_selected (false); 		-		if (oi.glyphs == null || ((!) oi.glyphs).is_unassigned ()) {-			return;+		gc = (!) oi.glyphs;		+		+		if (oi.glyphs != null && ((!) oi.glyphs).is_unassigned ()) {+			gc = null; 		} 		-		gc = (!) oi.glyphs;		 		MainWindow.tabs.add_tab (new OtfFeatureTable (gc)); 	} 	-	public void process_transform () {+	public void process_transform (Transform transform) { 		OverView o; 		Glyph g; 		OverView.OverViewUndoItem ui;@@ -273,17 +309,26 @@ public class OverviewTools : ToolCollection  { 				ui.glyphs.add (gc.copy_deep ()); 				g.add_help_lines (); 				-				if (skew.get_value () != 0) {-					DrawingTools.resize_tool.skew_glyph (g, -skew.get_value (), 0, false);+				if (transform == Transform.SLANT) {+					if (skew.get_value () != 0) {+						DrawingTools.resize_tool.skew_glyph (g, -skew.get_value (), 0, false);+					} 				} 				-				if (resize.get_value () != 100) {-					double scale = resize.get_value () / 100;-					DrawingTools.resize_tool.resize_glyph (g, scale, scale, false);+				if (transform == Transform.SIZE) {+					if (resize.get_value () != 100) {+						double scale = resize.get_value () / 100;+						DrawingTools.resize_tool.resize_glyph (g, scale, scale, false);+					} 				} 			} 		} 		+		foreach (OverViewItem item in o.visible_items) {+			item.clear_cache ();+			item.draw_glyph_from_font ();+		}+		 		o.undo_items.add (ui); 		 		MainWindow.get_overview ().update_item_list ();@@ -310,16 +355,9 @@ public class OverviewTools : ToolCollection  { 		GlyphRange gr; 		uint size; 		OverView overview;-		Font font;-		-		// All characters including .notdef-		font = BirdFont.get_current_font ();-		size = font.length ();-		-		if (!font.has_glyph (".notdef")) {-			size++;-		}-		++		// All characters+		size = BirdFont.get_current_font ().length (); 		all_glyphs.number = get_display_value (size); 		 		// Defaultdiff --git a/libbirdfont/Path.vala b/libbirdfont/Path.valaindex 11e0f1b..7e4650e 100644--- a/libbirdfont/Path.vala+++ b/libbirdfont/Path.vala@@ -14,7 +14,6 @@  using Cairo; using Math;-using SvgBird;  namespace BirdFont { @@ -68,7 +67,7 @@ public class Path : GLib.Object { 	 	private double path_stroke_width = 0; 	-	public SvgBird.LineCap line_cap = SvgBird.LineCap.BUTT;+	public LineCap line_cap = LineCap.BUTT; 	public PathList? full_stroke = null; 	PathList? fast_stroke = null; 	StrokeTask? stroke_creator;@@ -84,9 +83,15 @@ public class Path : GLib.Object { 	bool clockwise_direction = true;  	// Iterate over each pixel in a path-	public delegate bool RasterIterator (double x, double y, double step);	+	public delegate bool RasterIterator (double x, double y, double step);+	 	public delegate bool SegmentIterator (EditPoint start, EditPoint stop); 	+	/** The stroke of an outline when the path is not filled. */+	public static double stroke_width = 0;+	public static bool show_all_line_handles = true;+	public static bool fill_open_path {get; set;}+	 	public double rotation = 0; 	public double skew = 0; 	@@ -94,14 +99,27 @@ public class Path : GLib.Object { 	public bool highlight_last_segment = false; 	 	public string point_data = "";-	-	private static Text? arrow = null;  	public Color? color = null; 	public Color? stroke_color = null;+ 	public Gradient? gradient = null;+	+	private static Text? arrow = null;  	public Path () {	+		string width;+		+		if (unlikely (stroke_width < 1)) {+			width = Preferences.get ("stroke_width");+			if (width != "") {+				stroke_width = double.parse (width);+			}+		}++		if (stroke_width < 1) {+			stroke_width = 1;+		} 	}  	public bool is_filled () {@@ -157,6 +175,22 @@ public class Path : GLib.Object { 		return points.size == 0; 	} +	public void draw_boundaries  (Context cr) {+		double x = Glyph.reverse_path_coordinate_x (xmin); +		double y = Glyph.reverse_path_coordinate_y (ymin);+		double x2 = Glyph.reverse_path_coordinate_x (xmax);+		double y2 = Glyph.reverse_path_coordinate_y (ymax);+		+		cr.save ();+		+		Theme.color (cr, "Default Background");+		cr.set_line_width (2);+		cr.rectangle (x, y, x2 - x, y2 - y);+		cr.stroke ();+		+		cr.restore ();+	}+ 	public void draw_outline (Context cr) { 		unowned EditPoint? n = null; 		unowned EditPoint en;@@ -183,7 +217,7 @@ public class Path : GLib.Object { 			i++; 		} -		// closed path+		// close path 		if (!is_open () && n != null) { 			if (highlight_last_segment) { 				cr.stroke ();@@ -208,20 +242,19 @@ public class Path : GLib.Object { 		} 	} 	-	public void draw_control_points (Context cr) {		-		// control points for curvature-		foreach (EditPoint e in points) {-			if (CanvasSettings.show_all_line_handles -				|| e.selected_point-				|| e.selected_handle > 0) {-					-				draw_edit_point_handles (e, cr);+	public void draw_edit_points (Context cr) {		+		if (is_editable ()) {+			// control points for curvature+			foreach (EditPoint e in points) {+				if (show_all_line_handles || e.selected_point || e.selected_handle > 0) {+					draw_edit_point_handles (e, cr);+				}+			}+						+			// control points+			foreach (EditPoint e in points) {+				draw_edit_point (e, cr); 			}-		}-					-		// on curve control points-		foreach (EditPoint e in points) {-			draw_edit_point (e, cr); 		} 	} @@ -229,7 +262,7 @@ public class Path : GLib.Object { 	 * Call Context.new_path (); before this method and Context.fill () 	 * to show the path. 	 */-	public void draw_path (Context cr, Color? color = null) {+	public void draw_path (Context cr, Glyph glyph, Color? color = null) { 		unowned EditPoint? n = null; 		unowned EditPoint en; 		unowned EditPoint em;@@ -241,8 +274,8 @@ public class Path : GLib.Object { 			return; 		} -		center_x = Glyph.xc ();-		center_y = Glyph.yc ();+		center_x = glyph.allocation.width / 2.0;+		center_y = glyph.allocation.height / 2.0;  		ex = center_x + points.get (0).x; 		ey = center_y - points.get (0).y;@@ -275,6 +308,12 @@ public class Path : GLib.Object { 		} else if (color != null) { 			c = (!) color; 			cr.set_source_rgba (c.r, c.g, c.b, c.a);+		} else {+			if (is_clockwise ()) {+				Theme.color_opacity (cr, "Selected Objects", 0.4);+			} else {+				Theme.color_opacity (cr, "Selected Objects", 0.8);+			}	 		} 	} @@ -307,13 +346,17 @@ public class Path : GLib.Object { 		y = Glyph.yc () - top.y - sin (angle + PI / 2) * 10 * Glyph.ivz (); 		 		if (points.size > 0) {-			cr.save ();-			cr.translate (x, y); 			double inverted_zoom = Glyph.ivz ();-			cr.rotate (-angle);-			cr.translate (-x, -y);+			double zoom = 1 / inverted_zoom; 			cr.scale (inverted_zoom, inverted_zoom);-			arrow_icon.draw_at_baseline (cr, x, y);+			+			cr.save ();+			cr.translate (x * zoom, y * zoom);+			cr.rotate (-angle);+			cr.translate (-x * zoom, -y * zoom); +						+			arrow_icon.draw_at_baseline (cr, x * zoom, y * zoom);+			 			cr.restore (); 		} 	}@@ -347,6 +390,7 @@ public class Path : GLib.Object { 	} 		 	private static void draw_curve (EditPoint e, EditPoint en, Context cr, bool highlighted = false, double alpha = 1) {+		Glyph g = MainWindow.get_current_glyph (); 		double xa, ya, xb, yb, xc, yc, xd, yd; 		PointType t = e.get_right_handle ().type; 		PointType u = en.get_left_handle ().type;@@ -359,6 +403,8 @@ public class Path : GLib.Object { 			Theme.color (cr, "Highlighted Guide"); 		} 		+		cr.set_line_width (stroke_width / g.view_zoom);+		 		cr.line_to (xa, ya); // this point makes sense only if it is in the first or last position  		if (t == PointType.QUADRATIC || t == PointType.LINE_QUADRATIC || t == PointType.DOUBLE_CURVE || u == PointType.QUADRATIC || u == PointType.LINE_QUADRATIC || u == PointType.DOUBLE_CURVE) {@@ -424,7 +470,7 @@ public class Path : GLib.Object { 		get_line_points (e, en, out ax, out ay, out bx, out by); 		 		Theme.color (cr, "Handle Color");-		cr.set_line_width (1.7 * (CanvasSettings.stroke_width / g.view_zoom));+		cr.set_line_width (1.7 * (stroke_width / g.view_zoom));  		cr.line_to (ax, ay); 		cr.line_to (bx, by);@@ -554,7 +600,7 @@ public class Path : GLib.Object { 	public static void draw_control_point (Context cr, double x, double y, Color color, double size = 3.5) { 		Glyph g = MainWindow.get_current_glyph (); 		double ivz = 1 / g.view_zoom;-		double width = size * Math.sqrt (CanvasSettings.stroke_width) * ivz;+		double width = size * Math.sqrt (stroke_width) * ivz; 		double xc = g.allocation.width / 2.0; 		double yc = g.allocation.height / 2.0; @@ -777,6 +823,17 @@ public class Path : GLib.Object { 		new_path.highlight_last_segment = highlight_last_segment; 		 		return new_path;+	}	+	+	public bool is_over (double x, double y) {+		Glyph g = MainWindow.get_current_glyph ();+		+		x = x * Glyph.ivz () + g.view_offset_x - Glyph.xc ();+		y = y * Glyph.ivz () + g.view_offset_y - Glyph.yc ();++		y *= -1;+		+		return is_over_coordinate (x, y); 	} 	 	public bool is_over_coordinate (double x, double y) {@@ -938,7 +995,6 @@ public class Path : GLib.Object { 			points.add (p); 			p.prev = previous_point; 			p.next = previous_point.next;-			previous_point.next = p; 		} 		 		last_point = p;@@ -1478,7 +1534,7 @@ public class Path : GLib.Object { 		 		if (steps == -1) { 			steps = (int) (10 * get_length_from (start, stop));-		}+		}	 		 		if (right == PointType.DOUBLE_CURVE || left == PointType.DOUBLE_CURVE) { 			return all_of_double (start.x, start.y, start.get_right_handle ().x, start.get_right_handle ().y, stop.get_left_handle ().x, stop.get_left_handle ().y, stop.x, stop.y, iter, steps, min_t, max_t);@@ -2211,6 +2267,12 @@ public class Path : GLib.Object { 		 		lines = pl; 		+		/** // FIXME: Check automatic orientation.+		foreach (Path p in pl.paths) {+			lines.add (SvgParser.get_lines (p));+		}+		*/+		 		foreach (Path p in lines.paths) { 			if (p.points.size > 1 && p != path  				&& path.boundaries_intersecting (p)) {@@ -2252,10 +2314,11 @@ public class Path : GLib.Object { 		if (points.size == 0) { 			return; 		}-+		 		for (int i = 0; i < points.size + 1; i++) { 			EditPoint ep = points.get (i % points.size);-			if (ep.get_right_handle ().length < t3+			if ((ep.flags & EditPoint.STROKE_OFFSET) > 0+				&& ep.get_right_handle ().length < t3 				&& ep.get_left_handle ().length < t3 				&& !is_endpoint (ep) 				&& (ep.flags & EditPoint.CURVE_KEEP) == 0diff --git a/libbirdfont/PathList.vala b/libbirdfont/PathList.valaindex a14e2c2..84bf7b4 100644--- a/libbirdfont/PathList.vala+++ b/libbirdfont/PathList.vala@@ -12,8 +12,6 @@ 	Lesser General Public License for more details. */ -using SvgBird;- namespace BirdFont {  public class PathList : GLib.Object {@@ -80,20 +78,6 @@ public class PathList : GLib.Object { 		 		return pl; 	}--	public void apply_style (SvgStyle style) {-		foreach (Path p in paths) {-			if (style.has_stroke ()) {-				p.stroke = style.get_stroke_width ();-			} else {-				p.stroke = 0;-			}-			-			p.line_cap = style.get_line_cap ();-			p.reset_stroke ();-			p.update_region_boundaries ();		-		}-	} }  }diff --git a/libbirdfont/PathObject.vala b/libbirdfont/PathObject.valadeleted file mode 100644index f83d467..0000000--- a/libbirdfont/PathObject.vala+++ /dev/null@@ -1,154 +0,0 @@-/*-	Copyright (C) 2015 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;-using SvgBird;--namespace BirdFont {--public class PathObject : SvgBird.Object {--	public Path path;-	-	public override double stroke {-		get {-			return path.stroke;-		}-		-		set {-			path.stroke = value;-		}-	}---	// FIXME: flip y axis-	public override double xmin {-		get {-			return path.xmin;-		}--		set {-			path.xmin = value;-		}-		-		default = Glyph.CANVAS_MAX;-	}--	public override double xmax {-		get {-			return path.xmax;-		}--		set {-			path.xmax = value;-		}-		-		default = Glyph.CANVAS_MIN;-	}--	public override double ymin {-		get {-			return path.ymin;-		}--		set {-			path.ymin = value;-		}-		-		default = Glyph.CANVAS_MAX;-	}--	public override double ymax {-		get {-			return path.ymax;-		}--		set {-			path.ymax = value;-		}-		-		default = Glyph.CANVAS_MIN;-	}-		-	public PathObject () {-		base ();-		path = new Path ();-		update_region_boundaries ();-	}--	public PathObject.create_copy (PathObject p) {-		base.create_copy (p);-		path = p.path.copy ();-	}--	public PathObject.for_path (Path path) {-		base ();-		this.path = path;-	}--	public override bool is_over (double x, double y) {-		return path.is_over_coordinate (x, y);-	}-	-	public override void draw_outline (Context cr) {-		// drawing is handled in Glyph.draw_bird_font_paths-	}-	-	public void draw_path (Context cr) {-		path.draw_path (cr);-	}--	public static void draw_path_list (PathList pl, Context cr) {-		foreach (Path p in pl.paths) {-			p.draw_path (cr);-		}-	}-		-	public override void move (double dx, double dy) {-		path.move (dx, dy);-		path.reset_stroke ();-	}-	-	public Path get_path () {-		return path;-	}--	public override void update_region_boundaries () {-		path.update_region_boundaries ();-	}--	public override void rotate (double theta, double xc, double yc) {-		path.rotate (theta, xc, yc);-	}-	-	public override bool is_empty () {-		return path.points.size == 0;-	}-	-	public override void resize (double ratio_x, double ratio_y) {-		path.resize (ratio_x, ratio_y);-		path.reset_stroke ();-	}-	-	public override SvgBird.Object copy () {-		return new PathObject.create_copy (this);-	}--	public override string to_string () {-		return "PathObject";-	}--}--}diff --git a/libbirdfont/PenTool.vala b/libbirdfont/PenTool.valaindex 00163ff..36acc33 100644--- a/libbirdfont/PenTool.vala+++ b/libbirdfont/PenTool.vala@@ -765,11 +765,8 @@ public class PenTool : Tool { 			p.path.reset_stroke (); 		} 		-		foreach (Object path in g.active_paths) {-			if (path is PathObject) {-				PathObject p = (PathObject) path;-				p.get_path ().reset_stroke ();-			}+		foreach (Path path in g.active_paths) {+			path.reset_stroke (); 		} 	} 	@@ -818,7 +815,7 @@ public class PenTool : Tool { 				GridTool.tie_coordinate (ref coordinate_x, ref coordinate_y); 				delta_coordinate_x = coordinate_x - last_point_x; 				delta_coordinate_y = coordinate_y - last_point_y;			-				selected_handle.move_to_coordinate (selected_handle.x + delta_coordinate_x, selected_handle.y + delta_coordinate_y);+				selected_handle.move_delta_coordinate (delta_coordinate_x, delta_coordinate_y); 			} else if (GridTool.has_ttf_grid ()) { 				coordinate_x = Glyph.path_coordinate_x (x); 				coordinate_y = Glyph.path_coordinate_y (y);@@ -829,21 +826,17 @@ public class PenTool : Tool { 			} else { 				coordinate_x = Glyph.path_coordinate_x (x); 				coordinate_y = Glyph.path_coordinate_y (y);-				delta_coordinate_x = coordinate_x - last_point_x;-				delta_coordinate_y = coordinate_y - last_point_y;			-				selected_handle.move_delta_coordinate (delta_coordinate_x, delta_coordinate_y);+				+				selected_handle.move_to_coordinate (coordinate_x, coordinate_y); 				 				if (on_axis) {-					double horizontal, vertical;--					horizontal = Path.distance (selected_handle.parent.x, selected_handle.x, selected_handle.y, selected_handle.y);-					vertical = Path.distance (selected_handle.x, selected_handle.x, selected_handle.parent.y, selected_handle.y);--					if (horizontal < vertical) {-						selected_handle.move_to_coordinate (selected_handle.parent.x, selected_handle.y);-					} else {-						selected_handle.move_to_coordinate (selected_handle.x, selected_handle.parent.y);-					}					+					double tied_x = 0;+					double tied_y = 0;+					 +					PointTool.tie_angle (selected_handle.parent.x, selected_handle.parent.y,+							coordinate_x, coordinate_y, out tied_x, out tied_y);+					+					selected_handle.move_to_coordinate (tied_x, tied_y); 				} 			} @@ -1058,11 +1051,10 @@ public class PenTool : Tool { 				 				// don't use set point to reflective to on open ends 				reflective = true;-				foreach (SvgBird.Object path in MainWindow.get_current_glyph ().active_paths) {-					if (path.is_open () && !path.is_empty () && path is PathObject) {-						Path p = ((PathObject) path).get_path ();-						if (selected_handle.parent == p.get_first_point ()	-							|| selected_handle.parent == p.get_last_point ()) {+				foreach (Path path in MainWindow.get_current_glyph ().active_paths) {+					if (path.is_open () && path.points.size > 0) {+						if (selected_handle.parent == path.get_first_point ()	+							|| selected_handle.parent == path.get_last_point ()) { 							reflective = false; 						} 					}@@ -1233,10 +1225,7 @@ public class PenTool : Tool { 		 		if (active_edit_point != null) { 			glyph.clear_active_paths ();-			-			PathObject path = new PathObject.for_path (active_path);-			glyph.add_active_object (null, path);-			+			glyph.add_active_path (null, active_path); 			DrawingTools.update_stroke_settings (); 			 			if (KeyBindings.modifier != SHIFT) {@@ -1251,9 +1240,9 @@ public class PenTool : Tool { 				} 				 				// alt+click creates a point with symmetrical handles-				if (KeyBindings.has_alt () || KeyBindings.has_ctrl ()) {+				if (KeyBindings.has_alt () || KeyBindings.has_ctrl ()) {							 					selected_point.set_reflective_handles (true);-					selected_point.process_symmetrical_handles ();+					selected_point.get_right_handle ().process_symmetrical_handle (); 					GlyphCanvas.redraw (); 				} 			}@@ -1415,10 +1404,8 @@ public class PenTool : Tool {  			foreach (Path merge in paths) { 				if (merge.points.size > 0) {-					PathObject merged_path = new PathObject.for_path (merge);-					-					if (is_close_to_point (merge.points.get (merge.points.size - 1), px, py)) {	-						glyph.add_active_object (null, merged_path);+					if (is_close_to_point (merge.points.get (merge.points.size - 1), px, py)) {+						glyph.add_active_path (null, merge); 						active_path = merge; 						merge.reopen (); 						glyph.open_path ();@@ -1426,7 +1413,7 @@ public class PenTool : Tool { 					} 					 					if (is_close_to_point (merge.points.get (0), px, py)) {-						glyph.add_active_object (null, merged_path);+						glyph.add_active_path (null, merge); 						active_path = merge; 						clear_directions (); 						merge.reopen ();@@ -1456,15 +1443,14 @@ public class PenTool : Tool { 		} 		 		// join path with it self-		if (is_close_to_point (path.points.get (0), px, py) && path.points.size > 2) {+		if (is_close_to_point (path.points.get (0), px, py)) {+			 			close_path (path); 			glyph.close_path (); 			force_direction (); 			 			glyph.clear_active_paths ();-			-			PathObject closed_path = new PathObject.for_path (path);-			glyph.add_active_object (null, closed_path);+			glyph.add_active_path (null, path); 			 			if (direction_changed) { 				path.reverse ();@@ -1503,12 +1489,11 @@ public class PenTool : Tool { 				} else { 					union = merge_open_paths (path, merge);  -					PathObject union_path = new PathObject.for_path (union); 					glyph.add_path (union); 					glyph.delete_path (path); 					glyph.delete_path (merge); 					glyph.clear_active_paths ();-					glyph.add_active_object (null, union_path);+					glyph.add_active_path (null, union); 					 					union.reopen (); 					union.create_list ();@@ -1789,19 +1774,13 @@ public class PenTool : Tool { 		active_edit_point = new_point.point; 		 		return_val_if_fail (glyph.active_paths.size > 0, new PointSelection.empty ());-		SvgBird.Object object = glyph.active_paths.get (glyph.active_paths.size - 1);-		-		if (object is PathObject) {		-			Path path = ((PathObject) object).get_path ();-			-			add_selected_point (selected_point, path);+		add_selected_point (selected_point, glyph.active_paths.get (glyph.active_paths.size - 1)); -			active_path = new_point.path;-			glyph.clear_active_paths ();-			glyph.add_active_object (null, object);-		-			move_selected = true;-		}+		active_path = new_point.path;+		glyph.clear_active_paths ();+		glyph.add_active_path (null, new_point.path);++		move_selected = true; 		 		return new_point; 	}@@ -1837,7 +1816,6 @@ public class PenTool : Tool { 		EditPoint inserted; 		bool stroke = StrokeTool.add_stroke; 		Glyph g = MainWindow.get_current_glyph ();-		PathObject path; 		 		if (g.active_paths.size == 0) { 			np = new Path ();@@ -1845,8 +1823,7 @@ public class PenTool : Tool { 			np.stroke = stroke ? StrokeTool.stroke_width : 0; 			np.line_cap = StrokeTool.line_cap; 			-			path = new PathObject.for_path (np);-			g.add_active_object (null, path);+			g.add_active_path (null, np); 			 			active_path = np; 			selected_path = np;@@ -1872,8 +1849,7 @@ public class PenTool : Tool { 		}  		g.clear_active_paths ();-		path = new PathObject.for_path (np);-		g.add_active_object (null, path);+		g.add_active_path (null, np); 		active_path = np; 		selected_path = np; @@ -1924,7 +1900,7 @@ public class PenTool : Tool { 		Glyph g = MainWindow.get_current_glyph ();  		double distance_to_edit_point = g.view_zoom * get_distance_to_closest_edit_point (event_x, event_y); 		-		if (!CanvasSettings.show_all_line_handles) {+		if (!Path.show_all_line_handles) { 			foreach (PointSelection selected_corner in selected_points) { 				if (is_close_to_handle (selected_corner.point, event_x, event_y, distance_to_edit_point)) { 					return true;@@ -1994,7 +1970,7 @@ public class PenTool : Tool { 		 		foreach (Path p in g.get_paths_in_current_layer ()) { 			foreach (EditPoint ep in p.points) {-				if (ep.is_selected () || CanvasSettings.show_all_line_handles) {+				if (ep.is_selected () || Path.show_all_line_handles) { 					left = ep.get_left_handle (); 					right = ep.get_right_handle (); @@ -2083,8 +2059,7 @@ public class PenTool : Tool { 		selected_handle.selected = true; 		 		active_path = p.path;-		PathObject path = new PathObject.for_path (active_path);-		g.add_active_object (null, path);+		g.add_active_path (null, active_path); 	}  	public static void add_selected_point (EditPoint p, Path path) {diff --git a/libbirdfont/PointConverter.vala b/libbirdfont/PointConverter.valaindex 530af68..5880a3f 100644--- a/libbirdfont/PointConverter.vala+++ b/libbirdfont/PointConverter.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2014 Johan Mattsson+	Copyright (C) 2014 2016 Johan Mattsson  	This library is free software; you can redistribute it and/or modify  	it under the terms of the GNU Lesser General Public License as @@ -48,6 +48,8 @@ public class PointConverter { 			} 		} 		+		+		 		if (!original_path.is_open ()) { 			if (quadratic_path.get_last_point ().get_right_handle ().type == PointType.CUBIC) { 				PenTool.convert_point_segment_type (quadratic_path.get_last_point (),@@ -91,8 +93,9 @@ public class PointConverter { 			quadratic_segment_start = segment_start.copy (); 			quadratic_segment_stop = segment_stop.copy (); 			-			PenTool.convert_point_segment_type (quadratic_segment_start, quadratic_segment_stop, PointType.DOUBLE_CURVE);-			+			PenTool.convert_point_segment_type (quadratic_segment_start, quadratic_segment_stop, PointType.DOUBLE_CURVE);			++			// add new points to estimate path 			distance = 0; 			e = new EditPoint (); 			if (segment_start.get_right_handle ().is_line () @@ -122,7 +125,7 @@ public class PointConverter { 			out double distance, out EditPoint new_point, out double step) { 		double max_d; 		double min_d;-		int steps = (int) (1.6 * Path.get_length_from (a0, a1));+		int steps; 		double x_out, y_out; 		double step_out; diff --git a/libbirdfont/PointTool.vala b/libbirdfont/PointTool.valaindex 1886015..0cf7b38 100644--- a/libbirdfont/PointTool.vala+++ b/libbirdfont/PointTool.vala@@ -21,7 +21,7 @@ namespace BirdFont { public class PointTool : Tool { 	 	public PointTool (string name) {-		base (name, t_ ("Move control points"));+		base (name, "");  		select_action.connect ((self) => { 		});@@ -79,10 +79,50 @@ public class PointTool : Tool { 			p.draw_action (p, cairo_context, glyph); 		}); 	}++	public override string get_tip () {+		string tip = t_ ("Move control points") + "\n";+		+		tip += HiddenTools.move_along_axis.get_key_binding ();+		tip += " - ";+		tip += t_ ("on axis") + "\n";+				+		return tip;+	} 	 	public static Tool pen () { 		return MainWindow.get_toolbox ().get_tool ("pen_tool"); 	}+	+	public static void tie_angle (double center_x, double center_y,+			double coordinate_x, double coordinate_y,			+			out double tied_x, out double tied_y) {+			+		double length = fabs (Path.distance (center_x, coordinate_x,+			center_y, coordinate_y));+		+		tied_x = 0;+		tied_y = 0;+		+		double min = double.MAX;+		double circle_edge;+		double circle_x;+		double circle_y;+		+		for (double circle_angle = 0; circle_angle < 2 * PI; circle_angle += PI / 4) {+			circle_x = center_x + cos (circle_angle) * length;+			circle_y = center_y + sin (circle_angle) * length;+			+			circle_edge = fabs (Path.distance (coordinate_x, circle_x, +				coordinate_y, circle_y));+			+			if (circle_edge < min) {+				tied_x = circle_x;+				tied_y = circle_y;+				min = circle_edge;+			}+		}+	} }  }diff --git a/libbirdfont/Preferences.vala b/libbirdfont/Preferences.valaindex fb512f4..d4d5f37 100644--- a/libbirdfont/Preferences.vala+++ b/libbirdfont/Preferences.vala@@ -77,6 +77,25 @@ public class Preferences { 		set ("recent_files", @"$(recent.str)"); 	} +	public static void set_window_size (int x, int y, int width, int height) {+		set ("window_x", @"$x");+		set ("window_y", @"$y");+		set ("window_width", @"$width");+		set ("window_height", @"$height");+	}++	public static int get_window_x () {+		string wp = get ("window_x");+		int x = int.parse (wp);+		return x;+	}++	public static int get_window_y () {+		string wp = get ("window_y");+		int y = int.parse (wp);+		return y;+	}+	 	public static int get_window_width() { 		string wp = get ("window_width"); 		int w = int.parse (wp);diff --git a/libbirdfont/Preview.vala b/libbirdfont/Preview.valaindex 5f1a125..6cf0929 100644--- a/libbirdfont/Preview.vala+++ b/libbirdfont/Preview.vala@@ -28,7 +28,7 @@ public class Preview : FontDisplay { 	}  	public override void selected_canvas () {-	MainWindow.set_scrollbar_size (0);+		MainWindow.set_scrollbar_size (0); 	}  	public static string get_html_path () {@@ -113,11 +113,26 @@ public class Preview : FontDisplay { 		try { 			dis = new DataInputStream (get_file ().read ()); -			preview_directory = BirdFont.get_preview_directory ();+			string? d = font.get_export_directory ();+			+			if (d == null) {+				warning ("Export dir is not set.");+				ExportTool.set_output_directory ();+				d = font.get_export_directory ();+			}+			+			preview_directory = File.new_for_path ((!) d);+			+			printd (@"previwdir $((!) d)");+			+			if (ExportTool.get_export_folder () == "") {+				ExportTool.set_output_directory ();+			} -			f_ttf = get_child (ExportTool.get_export_dir (), @"$(ExportSettings.get_file_name (font)).ttf");-			f_eot = get_child (ExportTool.get_export_dir (), @"$(ExportSettings.get_file_name (font)).eot");-			f_svg = get_child (ExportTool.get_export_dir (), @"$(ExportSettings.get_file_name (font)).svg");+			File dir = File.new_for_path ((!) d);+			f_ttf = get_child (dir, @"$(ExportSettings.get_file_name (font)).ttf");+			f_eot = get_child (dir, @"$(ExportSettings.get_file_name (font)).eot");+			f_svg = get_child (dir, @"$(ExportSettings.get_file_name (font)).svg");  			if (!f_ttf.query_exists ()) { 				warning ("TTF file does not exist.");@@ -127,10 +142,12 @@ public class Preview : FontDisplay { 				warning ("SVG file does not exist."); 			} +			string name = ExportSettings.get_file_name (font);+			 			while ((line = dis.read_line (null)) != null) {-				line = ((!) line).replace (@"$(ExportSettings.get_file_name (font)).ttf", @"$(TabContent.path_to_uri ((!) f_ttf.get_path ()))?$rid");-				line = ((!) line).replace (@"$(ExportSettings.get_file_name (font)).eot", @"$(TabContent.path_to_uri ((!) f_eot.get_path ()))?$rid");-				line = ((!) line).replace (@"$(ExportSettings.get_file_name (font)).svg", @"$(TabContent.path_to_uri ((!) f_svg.get_path ()))?$rid");+				line = ((!) line).replace (@"$name.ttf", @"$(TabContent.path_to_uri ((!) f_ttf.get_path ()))?$rid");+				line = ((!) line).replace (@"$name.eot", @"$(TabContent.path_to_uri ((!) f_eot.get_path ()))?$rid");+				line = ((!) line).replace (@"$name.svg", @"$(TabContent.path_to_uri ((!) f_svg.get_path ()))?$rid"); 				sb.append ((!) line); 			} @@ -138,6 +155,7 @@ public class Preview : FontDisplay { 			warning (e.message); 			warning ("Failed to load html into canvas."); 		}+		 		return sb.str; 	} diff --git a/libbirdfont/PreviewTools.vala b/libbirdfont/PreviewTools.valaindex 41f1e54..c92ea2c 100644--- a/libbirdfont/PreviewTools.vala+++ b/libbirdfont/PreviewTools.vala@@ -62,7 +62,10 @@ public class PreviewTools : ToolCollection  { 				Preview.generate_html_document (); 			} 			-			MainWindow.tabs.select_tab_name ("Preview");+			if (ExportTool.error_message == null) {+				MainWindow.tabs.select_tab_name ("Preview");+			}+			 			return false; 		}); 		diff --git a/libbirdfont/QuestionDialog.vala b/libbirdfont/QuestionDialog.valaindex a5c39e6..cabe689 100644--- a/libbirdfont/QuestionDialog.vala+++ b/libbirdfont/QuestionDialog.vala@@ -28,12 +28,12 @@ public class QuestionDialog : Dialog { 	double height = 0; 	 	public QuestionDialog (string message) {-		Color color = Theme.get_color ("Text Tool Box");-		question = new TextArea (font_size, color);+		question = new TextArea (font_size); 		question.min_width = 300; 		question.min_height = font_size; 		question.set_editable (false); 		question.draw_border = false;+		question.text_color = Theme.get_color ("Text Tool Box"); 		question.set_text (message); 		buttons = new Gee.ArrayList<Button> (); 	}diff --git a/libbirdfont/RecentFiles.vala b/libbirdfont/RecentFiles.valaindex b8bfc72..0377d27 100644--- a/libbirdfont/RecentFiles.vala+++ b/libbirdfont/RecentFiles.vala@@ -42,12 +42,16 @@ public class RecentFiles : Table { 		} else if (row.get_index () == RECENT_FONT) { 			return_if_fail (row.get_row_data () is Font); 			f = (Font) row.get_row_data ();+			MainWindow.scrollbar.set_size (0);+			GlyphCanvas.redraw (); 			load_font (f.get_path ()); 		} else if (row.get_index () == BACKUP) { 			return_if_fail (row.get_row_data () is Font); 			f = (Font) row.get_row_data (); 			delete_backup (f.get_file_name ()); 		}++		GlyphCanvas.redraw (); 	}  	public override void update_rows () {@@ -240,7 +244,6 @@ public class RecentFiles : Table { 			 			f = BirdFont.new_font (); 			-			MainWindow.clear_glyph_cache (); 			MainWindow.close_all_tabs (); 			 			f.set_file (fn);diff --git a/libbirdfont/Renderer/CachedFont.vala b/libbirdfont/Renderer/CachedFont.valanew file mode 100644index 0000000..d93368a--- /dev/null+++ b/libbirdfont/Renderer/CachedFont.vala@@ -0,0 +1,99 @@+/*+	Copyright (C) 2015 Johan Mattsson++	This library is free software; you can redistribute it and/or modify +	it under the terms of the GNU Lesser General Public License as +	published by the Free Software Foundation; either version 3 of the +	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but +	WITHOUT ANY WARRANTY; without even the implied warranty of +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +	Lesser General Public License for more details.+*/++using Gee;++namespace BirdFont {+	+public class CachedFont : GLib.Object {+	public Font? font;++	public double top_limit {+		get { return _top_limit; }+		set { _top_limit = value; }+	}++	public double bottom_limit {+		get { return _bottom_limit; }+		set { _bottom_limit = value; }+	}+	+	public double base_line = 0;+	double _top_limit = 92.77; // FIXME: load before first glyph+	double _bottom_limit = -24.4;+	+	static FallbackFont fallback_font {+		get {+			if (_fallback_font == null) {+				_fallback_font = new FallbackFont ();+			}+			+			return (!) _fallback_font;+		}+	}+	static FallbackFont? _fallback_font = null;++	public CachedFont (Font? font) {+		Glyph? g;+		Glyph glyph;+		+		this.font = font;++		g = get_glyph_by_name ("a");+		if (g != null) {+			glyph = (!) g;+			base_line = glyph.baseline;+			top_limit = glyph.top_limit;+			bottom_limit = glyph.bottom_limit;+		} else {+			warning("No default chararacter found in font.");+		}+	}+	+	public Glyph? get_glyph_by_name (string name) {+		Glyph? g = null;+		Font f;+		Glyph glyph;+		+		if (font != null) {+			f = (!) font;+			g = f.get_glyph_by_name (name);+			+			if (g != null) {+				glyph = (!) g;+				glyph.top_limit = f.top_limit;+				glyph.baseline = f.base_line;+				glyph.bottom_limit = f.bottom_limit;+			}+		}+		+		if (g == null && name.char_count () == 1) {+			f = fallback_font.get_single_glyph_font (name.get_char (0));+			g = f.get_glyph_by_name (name);+			+			if (g == null) {+				return null;+			}+			+			glyph = (!) g;+			glyph.top_limit = f.top_limit;+			glyph.baseline = f.base_line;+			glyph.bottom_limit = f.bottom_limit;	+		}+		+		return g;+	}+}++}diff --git a/libbirdfont/Renderer/Drawing.vala b/libbirdfont/Renderer/Drawing.valanew file mode 100644index 0000000..2de5049--- /dev/null+++ b/libbirdfont/Renderer/Drawing.vala@@ -0,0 +1,50 @@+/*+	Copyright (C) 2014 Johan Mattsson++	This library is free software; you can redistribute it and/or modify +	it under the terms of the GNU Lesser General Public License as +	published by the Free Software Foundation; either version 3 of the +	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but +	WITHOUT ANY WARRANTY; without even the implied warranty of +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +	Lesser General Public License for more details.+*/++namespace BirdFont {++/** Interface for creating drawing callbacks. */+[Compact]+[CCode (ref_function = "bird_font_drawing_ref", unref_function = "bird_font_drawing_unref")]+public class Drawing {+	+	public int iterator_refcount = 1;+		+	public Drawing () {+	}++	public void new_path (double x, double y) {+	}++	public void curve_to (double xb, double yb, double xc, double yc, double xd, double yd) {+	}++	public void close_path (double x, double y) {+	}++	public unowned Drawing @ref () {+		iterator_refcount++;+		return this;+	}+	+	public void unref () {+		if (--iterator_refcount == 0) {+			this.free ();+		}+	}+	+	private extern void free ();+}++}diff --git a/libbirdfont/Renderer/FallbackFont.vala b/libbirdfont/Renderer/FallbackFont.valanew file mode 100644index 0000000..c696b4d--- /dev/null+++ b/libbirdfont/Renderer/FallbackFont.vala@@ -0,0 +1,336 @@+/*+	Copyright (C) 2015 Johan Mattsson++	This library is free software; you can redistribute it and/or modify +	it under the terms of the GNU Lesser General Public License as +	published by the Free Software Foundation; either version 3 of the +	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but +	WITHOUT ANY WARRANTY; without even the implied warranty of +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +	Lesser General Public License for more details.+*/++using Gee;++[SimpleType]+[CCode (has_type_id = false)]+public extern struct FcConfig {+}++[CCode (cname = "FcInitLoadConfigAndFonts")]+public extern FcConfig* FcInitLoadConfigAndFonts ();++[CCode (cname = "FcConfigAppFontAddDir")]+public extern string* FcConfigAppFontAddDir (FcConfig* config, string path);++[CCode (cname = "FcConfigSetSysRoot")]+public extern void FcConfigSetSysRoot (FcConfig* config, string path);++[CCode (cname = "FcConfigParseAndLoad")]+public extern bool FcConfigParseAndLoad (FcConfig* config, string path, bool complain);++[CCode (cname = "FcConfigSetCurrent")]+public extern void FcConfigSetCurrent (FcConfig* config);++[CCode (cname = "FcConfigCreate")]+public extern FcConfig* FcConfigCreate ();++[CCode (cname = "FcConfigFilename")]+public extern string FcConfigFilename (string path);++[CCode (cname = "find_font")]+public extern string? find_font (FcConfig* font_config, string characters);++[CCode (cname = "find_font_family")]+public extern string? find_font_family (FcConfig* font_config, string characters);++[CCode (cname = "find_font_file")]+public extern string? find_font_file (FcConfig* font_config, string font_name);++namespace BirdFont {++// TODO: use font config+public class FallbackFont : GLib.Object {+	Gee.ArrayList<File> font_directories;+	+	FontFace* default_font = null;+	public static FcConfig* font_config = null;+	static bool font_config_started = false;+	+	string default_font_file_name = "Roboto-Regular.ttf";+	string default_font_family_name = "Roboto";++	Gee.HashMap<unichar, CachePair> glyphs;+	Gee.ArrayList<CachePair> cached;++	public int max_cached_fonts = 300;+	+	string? default_font_file = null;+	+	public FallbackFont () {+		string home = Environment.get_home_dir ();+		font_directories = new Gee.ArrayList<File> ();++		if (!font_config_started) {+			font_config_started = true;+			+			IdleSource idle = new IdleSource ();+			idle.set_callback (() => {+				Task t = new Task (init_font_config);+				MainWindow.native_window.run_non_blocking_background_thread (t);+				return false;+			});+			idle.attach (null);+		}+		+		add_font_folder ("/usr/share/fonts/");+		add_font_folder ("/usr/local/share/fonts/");+		add_font_folder (home + "/.local/share/fonts");+		add_font_folder (home + "/.fonts");+		add_font_folder ("C:\\Windows\\Fonts");+		add_font_folder (home + "/Library/Fonts");+		add_font_folder ("/Library/Fonts");+		add_font_folder ("/Network/Library/Fonts");+		add_font_folder ("/System/Library/Fonts");+		add_font_folder ("/System Folder/Fonts");+		+		glyphs = new Gee.HashMap<unichar, CachePair> ();+		cached = new Gee.ArrayList<CachePair> ();+		+		open_default_font ();+	}+	+	~FallbackFont () {+		if (default_font != null) {+			close_font (default_font);+		}+	}++	public void init_font_config () {+		FcConfig* config;+		+#if MAC+		config = FcConfigCreate();+		+		string bundle = (!) BirdFont.get_settings_directory ().get_path ();+		FcConfigSetSysRoot(config, bundle);+	+		string path = FcConfigFilename((!) SearchPaths.search_file(null, "fontconfig.settings").get_path ());+		bool loaded = FcConfigParseAndLoad(config, path, true);+		+		if (!loaded) {+			warning ("Cannot load fontconfig.");+		}+		+		FcConfigSetCurrent (config);+#else+		config = FcInitLoadConfigAndFonts ();+#endif++		IdleSource idle = new IdleSource ();+		+		idle.set_callback (() => {+			font_config = config;+			return false;+		});+		idle.attach (null);+	}++	public Font get_single_glyph_font (unichar c) {+		Font f;+		unichar last; +		CachePair p;+		+		if (likely (glyphs.has_key (c))) {+			p = glyphs.get (c);+			+			if (p.referenced < int.MAX) {+				p.referenced++;+			}+			+			return p.font;+		}++		// remove glyphs from cache if it is full+		if (cached.size > max_cached_fonts - 100) {+			+			cached.sort ((a, b) => {+				CachePair pa = (CachePair) a;+				CachePair pb = (CachePair) b;+				return pb.referenced - pa.referenced;+			});+			+			int j = 0;+			for (int i = cached.size - 1; i > 0; i--) {+				if (j > 100) {+					break;+				}+				+				j++;+				+				last = cached.get (i).character;+				glyphs.unset (last);+				cached.remove_at (i);+			}+		}+				+		f = get_single_fallback_glyph_font (c);+		p = new CachePair (f, c);+		+		glyphs.set (c, p);+		cached.add (p);+		+		return (Font) f;+	}++	Font get_single_fallback_glyph_font (unichar c) {+		string? font_file;+		BirdFontFile bf_parser;+		Font bf_font;+		StringBuilder? glyph_data;+		FontFace* font;++		bf_font = new Font ();+		font_file = null;+		glyph_data = null;++		// don't use fallback font in private use area+		if (0xe000 <= c <= 0xf8ff) {+			return bf_font;+		}+		+		// control characters+		if (c <= 0x001f || (0x007f <= c <= 0x008d)) {+			return bf_font;+		}+		+		// check if glyph is available in roboto+		if (default_font != null) {+			glyph_data = get_glyph_in_font ((!) default_font, c);+		}+				+		// use fontconfig to find a fallback font+		if (glyph_data == null) {+			font_file = find_font (font_config, (!) c.to_string ());+			if (font_file != null) {+				font = open_font ((!) font_file);+				glyph_data = get_glyph_in_font (font, c);+				close_font (font);+			}+		}+		+		if (glyph_data != null) {+			bf_parser = new BirdFontFile (bf_font);+			bf_parser.load_data (((!) glyph_data).str);+		}++		return bf_font;		+	}++	public StringBuilder? get_glyph_in_font (FontFace* font, unichar c) {+		StringBuilder? glyph_data = null;+		GlyphCollection gc;++		gc = new GlyphCollection (c, (!)c.to_string ());		+		glyph_data = load_glyph (font, (uint) c);++		return glyph_data;+	}+	+	void add_font_folder (string f) {+		File folder = File.new_for_path (f);+		FileInfo? file_info;+		string fn;+		string file_attributes;+		try {+			if (folder.query_exists ()) {+				font_directories.add (folder);+				+				file_attributes = FileAttribute.STANDARD_NAME;+				file_attributes += ",";+				file_attributes += FileAttribute.STANDARD_TYPE;+				var enumerator = folder.enumerate_children (file_attributes, 0);+				+				while ((file_info = enumerator.next_file ()) != null) {+					fn = ((!) file_info).get_name ();++					if (((!)file_info).get_file_type () == FileType.DIRECTORY) {+						add_font_folder ((!) get_child (folder, fn).get_path ());+					}+				}+			}+		} catch (GLib.Error e) {+			warning (e.message);+		}+	}++	File search_font_file (string font_file) {+		File d, f;+		+		for (int i = font_directories.size - 1; i >= 0; i--) {+			d = font_directories.get (i);+			f = get_child (d, font_file);+			+			if (f.query_exists ()) {+				return f;+			}+		}+		+		warning (@"The font $font_file not found");+		return File.new_for_path (font_file);+	}++	public string? get_default_font_file () {+		File font_file;+		string? fn = null;+		+		if (likely (default_font_file != null)) {+			return default_font_file;+		}+		+		font_file = SearchPaths.search_file (null, default_font_file_name);+		+		if (font_file.query_exists ()) {+			fn = (!) font_file.get_path ();+		} else {+			font_file = search_font_file (default_font_file_name);+	+			if (font_file.query_exists ()) {+				fn = (!) font_file.get_path ();+			} else {+				fn = find_font_file (font_config, default_font_family_name);+			}+		}+			+		if (likely (fn != null)) {+			default_font_file = fn;+			return fn;+		}+		+		warning(default_font_family_name + " not found");+		return null;+	}+	+	void open_default_font () {+		string? fn = get_default_font_file ();+		+		if (fn != null) {+			default_font = open_font ((!) fn);+		}+	}+	+	class CachePair : GLib.Object {+		public Font font;+		public unichar character;+		public int referenced = 1;+		+		public CachePair (Font f, unichar c) {+			font = f;+			character = c;+		}+	}+}++}diff --git a/libbirdfont/Renderer/FontCache.vala b/libbirdfont/Renderer/FontCache.valanew file mode 100644index 0000000..5bf2fa3--- /dev/null+++ b/libbirdfont/Renderer/FontCache.vala@@ -0,0 +1,83 @@+/*+	Copyright (C) 2014 Johan Mattsson++	This library is free software; you can redistribute it and/or modify +	it under the terms of the GNU Lesser General Public License as +	published by the Free Software Foundation; either version 3 of the +	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but +	WITHOUT ANY WARRANTY; without even the implied warranty of +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +	Lesser General Public License for more details.+*/++using Gee;++namespace BirdFont {++/** Thread specific font cache. */	+public class FontCache {	+	public static FallbackFont fallback_font;+	+	static FontCache? default_cache = null;+	Gee.HashMap<string, CachedFont> fonts;+	CachedFont fallback;+	+	public FontCache () {+		if (is_null (fallback_font)) {+			fallback_font = new FallbackFont ();+		}+		+		fallback = new CachedFont (null);+		fonts = new Gee.HashMap<string, CachedFont> ();+	}+	+	public CachedFont get_font (string file_name) {+		CachedFont c;+		Font f;+		bool ok;++		if (file_name == "") {+			return fallback;+		}+		+		if (fonts.has_key (file_name)) {+			c = fonts.get (file_name);+			return c;+		}+		+		f = new Font ();+		f.set_file (file_name);+		ok = f.load ();+		if (!ok) {+			stderr.printf ("Can't load %s\n", file_name);+			return new CachedFont (null);+		}+		+		c = new CachedFont (f);+		+		if (file_name == "") {+			warning ("No file.");+			return c;+		}+		+		fonts.set (file_name, c);+		return c;+	}++	public static FontCache get_default_cache () {+		if (default_cache == null) {+			default_cache = new FontCache ();+		}+		+		return (!) default_cache;+	}++	public CachedFont get_fallback () {+		return fallback;+	}++}++}diff --git a/libbirdfont/Renderer/LineTextArea.vala b/libbirdfont/Renderer/LineTextArea.valanew file mode 100644index 0000000..24b8f11--- /dev/null+++ b/libbirdfont/Renderer/LineTextArea.vala@@ -0,0 +1,33 @@+/*+	Copyright (C) 2014 Johan Mattsson++	This library is free software; you can redistribute it and/or modify +	it under the terms of the GNU Lesser General Public License as +	published by the Free Software Foundation; either version 3 of the +	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but +	WITHOUT ANY WARRANTY; without even the implied warranty of +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +	Lesser General Public License for more details.+*/++using Cairo;+using Math;++namespace BirdFont {++public class LineTextArea : TextArea {++	public LineTextArea (double size) {+		base (size);+		+		single_line = true;+		min_height = size;+		height = min_height;+		+		layout ();+	}+}++}diff --git a/libbirdfont/Renderer/Text.vala b/libbirdfont/Renderer/Text.valanew file mode 100644index 0000000..a5d368a--- /dev/null+++ b/libbirdfont/Renderer/Text.vala@@ -0,0 +1,591 @@+/*+	Copyright (C) 2014 2015 Johan Mattsson++	This library is free software; you can redistribute it and/or modify +	it under the terms of the GNU Lesser General Public License as +	published by the Free Software Foundation; either version 3 of the +	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but +	WITHOUT ANY WARRANTY; without even the implied warranty of +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +	Lesser General Public License for more details.+*/++using Cairo;+using Math;++namespace BirdFont {+	+/** Test implementation of a birdfont rendering engine. */+public class Text : Widget {+	FontCache font_cache;+	public CachedFont cached_font;+	+	Surface? cache = null;+	+	public string text;+	+	private bool use_cache = true;+	+	GlyphSequence glyph_sequence {+		get {+			if (gs == null) {+				gs = generate_glyphs ();+			}+			+			return (!) gs;+		}+	}+	+	Gee.ArrayList<string> glyph_names;+	GlyphSequence? gs = null;+	+	public delegate void Iterator (Glyph glyph, double kerning, bool last);+	public double font_size;+	double sidebearing_extent = 0;++	public double r = 0;+	public double g = 0;+	public double b = 0;+	public double a = 1;+	double truncated_width = -1;+	+	double margin_left = 0;+	+	public Text (string text = "", double size = 17, double margin_bottom = 0) {+		this.margin_bottom = margin_bottom;+		font_cache = FontCache.get_default_cache ();+		cached_font = font_cache.get_fallback ();+		+		set_text (text);+		set_font_size (size);+	}+	+	public void set_use_cache (bool cache) {+		use_cache = cache;+	}+	+	public string get_text () {+		return text;+	}+	+	/** Set font for this text area.+	 * @param font_absolute path to the font file or a file name for one of the font files in search paths.+	 * @return true if the font was found+	 */+	public bool load_font (string font_file) {+		File path;+		File f;+		FontCache fc;+		+		f = File.new_for_path (font_file);+		path = (f.query_exists ()) ? f : SearchPaths.find_file (null, font_file);+		+		fc = FontCache.get_default_cache ();+		cached_font = fc.get_font ((!) path.get_path ());+		gs = generate_glyphs ();+		+		return cached_font.font != null;+	}+	+	public void set_font_size (double height_in_pixels) {+		font_size = height_in_pixels;+		sidebearing_extent = 0;+		+		if (gs == null) { // ensure height is loaded for the font+			gs = generate_glyphs ();+		}+	}++	public void set_font_cache (FontCache font_cache) {+		this.font_cache = font_cache;+	}+	+	public void set_text (string text) {	+		this.text = text;+		gs = null;+		sidebearing_extent = 0;+		cache = null;+	}++	private GlyphSequence generate_glyphs () {+		int index;+		unichar c;+		string name;+		Glyph? g;+		GlyphSequence gs;+		+		gs = new GlyphSequence ();+		+		glyph_names = new Gee.ArrayList<string> ();+		index = 0;+		while (text.get_next_char (ref index, out c)) {+			name = (!) c.to_string ();+			g = cached_font.get_glyph_by_name (name);+			+			gs.glyph.add (g);+			glyph_names.add (name);+		}+		+		return gs;+	}++	public void iterate (Iterator iter) {+		Glyph glyph;+		double w, kern;+		int wi;+		Glyph? prev;+		Glyph? g;+		GlyphSequence word_with_ligatures;+		GlyphRange? gr_left, gr_right;+		GlyphSequence word;+		KerningClasses kc;+		Font empty = Font.empty;+		+		glyph = new Glyph.no_lines ("", '\0');++		w = 0;+		prev = null;+		kern = 0;+	+		word = glyph_sequence;+		wi = 0;+	+		if (cached_font.font != null) {+			word_with_ligatures = word.process_ligatures ((!) cached_font.font);+		} else {+			word_with_ligatures = word.process_ligatures (new Font ());+		}+		+		gr_left = null;+		gr_right = null;+		+		if (cached_font.font != null) {+			kc = ((!) cached_font.font).get_kerning_classes ();+		} else {+			kc = new KerningClasses (empty);+		}	++		if (word_with_ligatures.glyph.size > 0) {+			double none = 0;+			g = word_with_ligatures.glyph.get (0);+			if (g != null) {+				margin_left = ((!) g).get_left_side_bearing ();+				+				if (margin_left < 0) {+					margin_left = -margin_left;+				} else {+					margin_left = 0;+				}+			}+		}+		+		for (int i = 0; i < word_with_ligatures.glyph.size; i++) {+			g = word_with_ligatures.glyph.get (i);+			+			if (g == null || prev == null || wi == 0) {+				kern = 0;+			} else {+				return_if_fail (wi < word_with_ligatures.ranges.size);+				return_if_fail (wi - 1 >= 0);+				+				gr_left = word_with_ligatures.ranges.get (wi - 1);+				gr_right = word_with_ligatures.ranges.get (wi);++				kern = kc.get_kerning_for_pair (((!) prev).get_name (), ((!) g).get_name (), gr_left, gr_right);+			}+				+			// process glyph+			if (g == null && (0 <= i < glyph_names.size)) {+				g = cached_font.get_glyph_by_name (glyph_names.get (i));+			}+			+			glyph = (g == null) ? new Glyph ("") : (!) g;+			iter (glyph, kern, i + 1 == word_with_ligatures.glyph.size);			+			prev = g;+			wi++;+		}+	}++	// FIXME: some fonts doesn't have on curve extrema+	public double get_extent () {+		double x = 0;+		+		iterate ((glyph, kerning, last) => {+			double x1, y1, x2, y2;+			double lsb;+			+			lsb = glyph.left_limit;+			+			if (!last) {+				x += (glyph.get_width () + kerning) * get_scale (glyph);+			} else {+				glyph.boundaries (out x1, out y1, out x2, out y2);+				x += (x2 - lsb) * get_scale (glyph);+			}+		});+		+		return x;+	}++	public double get_sidebearing_extent () {+		double x ;+		+		if (likely (sidebearing_extent > 0)) {+			return sidebearing_extent;+		}+		+		x = 0;+		+		iterate ((glyph, kerning, last) => {+			double lsb;+			lsb = glyph.left_limit;+			x += (glyph.get_width () + kerning) * get_scale (glyph);+		});+		+		sidebearing_extent = x;+		return x;+	}++	public override double get_height () {+		return font_size;+	}+	+	public double get_acender () {+		double max_height = 0;+		+		iterate ((glyph, kerning, last) => {+			double x1, y1, x2, y2;+			double h;+			glyph.boundaries (out x1, out y1, out x2, out y2);+			h = Math.fmax (y1, y2) - Math.fmin (y1, y2);+			h *= get_scale (glyph) - glyph.baseline * get_scale (glyph);+			if (h > max_height) {+				max_height = h;+			}+		});+		+		return max_height;+	}	++	public override double get_width () {+		double x = 0;+		bool first = true;+		+		iterate ((glyph, kerning, last) => {+			double x1, y1, x2, y2;+			double lsb;+			+			lsb = glyph.left_limit;+			+			if (first) {+				glyph.boundaries (out x1, out y1, out x2, out y2);+				x += (glyph.get_width () + kerning - Math.fmin (x1, x2)) * get_scale (glyph);+				first = false;+			} else if (!last) {+				x += (glyph.get_width () + kerning) * get_scale (glyph);+			} else {+				glyph.boundaries (out x1, out y1, out x2, out y2);+				x += (x2 - lsb) * get_scale (glyph);+			}+		});+		+		return x;+	}++	public double get_decender () {+		double decender_max = get_max_decender ();+		return decender_max > 0 ? decender_max : 0; +	}		++	private double get_max_decender () {+		double decender = 0;+		double decender_max = 0;+		+		iterate ((glyph, kerning, last) => {+			double x1, y1, x2, y2;+			double y;+			glyph.boundaries (out x1, out y1, out x2, out y2);+			y = Math.fmin (y1, y2);+			decender = (glyph.baseline - y) * get_scale (glyph);+			if (decender > decender_max) {+				decender_max = decender;+			}+		});+		+		return decender_max; +	}+		+	public override void draw (Context cr) {+		double descender = cached_font.bottom_limit + cached_font.base_line;+		double y = widget_y + get_height () + get_font_scale () * descender; // FIXME:+		draw_at_baseline (cr, widget_x, y);+	}+	+	public void draw_at_top (Context cr, double px, double py, string cacheid = "") {+		double s = get_font_scale ();+		double y = py + s * (cached_font.top_limit - cached_font.base_line);+		draw_at_baseline (cr, px, y, cacheid);+	}+	+	public void set_source_rgba (double r, double g, double b, double a) {+		if (this.r != r || +			this.g != g || +			this.b != b || +			this.a != a) {+		+			this.r = r;+			this.g = g;+			this.b = b;+			this.a = a;+			cache = null;+		}+	}+	+	public string get_cache_id (int offset_x, int offset_y) {+		string key;+		int64 c;+		+		c = (((int64) (r * 255)) << 24)+			| (((int64) (g * 255)) << 16)+			| (((int64) (b * 255)) << 8)+			| (((int64) (a * 255)) << 0);+		+		// FIXME: use binary key+		key = @"$font_size $c $offset_x $offset_y";+		+		return key;+	}+	+	public void draw_at_baseline (Context cr, double px, double py, string cacheid = "") {+		double x, y;+		double ratio;+		double cc_y;++		if (cache == null) {+			cache = draw_on_cache_surface (cacheid);+		}+		+		double screen_scale = Screen.get_scale ();+		double font_scale = get_font_scale ();+		double cache_y = py - font_scale * (cached_font.top_limit - cached_font.base_line);++		cr.save();+		cr.scale (1 / screen_scale, 1 / screen_scale);+		double scaled_x = (px - margin_left) * screen_scale;+		double scaled_y = cache_y * screen_scale;+		cr.set_source_surface ((!) cache, (int) rint (scaled_x), (int) rint (scaled_y));+		cr.paint ();+		cr.restore();+	}+	+	Surface draw_on_cache_surface (string cacheid) {+		double y;+		double ratio;+		double cc_y;+		Context cr;+		Surface cache_surface;+		double screen_scale = Screen.get_scale();+		double h = font_size * screen_scale + 1;++		ratio = get_font_scale ();+		cc_y = (cached_font.top_limit - cached_font.base_line) * ratio;++		// double x = margin_left * ratio;+		double x = 0;+		double py = cc_y;++		double w = get_sidebearing_extent () * screen_scale + x + margin_left + 1;+		+		cache_surface = Screen.create_background_surface ((int) w, (int) h);+		cr = new Context (cache_surface);+		cr.scale (screen_scale, screen_scale);++		y = cc_y;++		if (unlikely (cached_font.base_line != 0)) {+			warning ("Base line not zero.");+		}+		+		iterate ((glyph, kerning, last) => {+			double end;+			+			x += kerning * ratio;+			end = x + glyph.get_width () * ratio;+			+			// truncation+			if (truncated_width > 0 && end > truncated_width) {+				return;+			}++			if (use_cache) {+				draw_chached (cr, glyph, kerning, last, x, y, cc_y, +					ratio, cacheid);+			} else {+				draw_without_cache (cr, glyph, kerning, last, x, y, cc_y, ratio);+			}+			+			x = end;+		});+		+		return cache_surface;+	}++	void draw_without_cache (Context cr, Glyph glyph, double kerning, bool last, +		double x, double y, double cc_y, double ratio) {+	+		double lsb;+		+		cr.save ();+		cr.set_source_rgba (r, g, b, a);+		cr.new_path ();++		lsb = glyph.left_limit;++		foreach (Path path in glyph.get_visible_paths ()) {+			draw_path (cr, glyph, path, lsb, x, y, ratio);+		}++		cr.fill ();+		cr.restore ();+		+	}+		+	void draw_chached (Context cr, Glyph glyph, double kerning, bool last, +		double x, double y, double cc_y, double ratio,+		string cacheid = "") {+		+		double lsb;+		Surface cache;+		Surface cached_glyph;+		Context cc;+		string cache_id;+		double glyph_margin_left = glyph.get_left_side_bearing ();+		+		if (glyph_margin_left < 0) {+			glyph_margin_left = -glyph_margin_left;+		} else {+			glyph_margin_left = 0;+		}+		+		double xp = (x - glyph_margin_left * ratio) * Screen.get_scale ();+		double yp = (y - cc_y) * Screen.get_scale ();+		int offset_x, offset_y;++		offset_x = (int) (10 * (xp - (int) xp));+		offset_y = (int) (10 * (yp - (int) yp));+		+		cache_id = (cacheid == "") ? get_cache_id (offset_x, offset_y) : cacheid;+				+		if (!glyph.has_cache (cache_id)) {+			int w = (int) ((2 * glyph_margin_left * ratio + glyph.get_width ()) * ratio) + 2;+			int h = (int) font_size + 2;+			cache = Screen.create_background_surface (w, h);+			cc = new Context (cache);+			+			cc.scale(Screen.get_scale (), Screen.get_scale ());+			+			lsb = glyph.left_limit - glyph_margin_left;++			cc.save ();+			cc.set_source_rgba (r, g, b, a);+			cc.new_path ();++			foreach (Path path in glyph.get_visible_paths ()) {+				draw_path (cc, glyph, path, lsb, glyph_margin_left * ratio + offset_x / 10.0, cc_y + offset_y / 10.0, ratio);+			}+			+			cc.fill ();+			cc.restore ();++			if (use_cache) {+				glyph.set_cache (cache_id, cache);+			}+			+			cached_glyph = cache;+		} else {+			cached_glyph = glyph.get_cache (cache_id);+		}++		cr.save ();+		cr.set_antialias (Cairo.Antialias.NONE);+		cr.scale(1 / Screen.get_scale (), 1 / Screen.get_scale ());+		cr.set_source_surface (cached_glyph,+			(int) xp,+			(int) yp);+		cr.paint ();+		cr.restore ();+	}+	+	void draw_path (Context cr, Glyph glyph, Path path,+		double lsb, double x, double y, double scale) {+			+		EditPoint e, prev;+		double xa, ya, xb, yb, xc, yc, xd, yd;+		double by;+		double s = get_scale (glyph);+		+		if (path.points.size > 0) {+			if (unlikely (path.is_open ())) {+				warning (@"Path is open in $(glyph.get_name ()).");+			}+			+			//path.add_hidden_double_points (); // FIXME: this distorts shapes+				+			prev = path.points.get (path.points.size - 1);+			xa = (prev.x - lsb) * s + x;+			ya = y - prev.y * s;+			cr.move_to (xa, ya);+			+			by = (y - cached_font.base_line * s);+			for (int i = 0; i < path.points.size; i++) {+				e = path.points.get (i).copy ();+				+				PenTool.convert_point_segment_type (prev, e, PointType.CUBIC);+				+				xb = (prev.get_right_handle ().x - lsb) * s + x;+				yb = by - prev.get_right_handle ().y * s;++				xc = (e.get_left_handle ().x - lsb) * s + x;+				yc = by - e.get_left_handle ().y * s;+					+				xd = (e.x - lsb) * s + x;+				yd = by - e.y * s;++				cr.curve_to (xb, yb, xc, yc, xd, yd);+				cr.line_to (xd, yd);+				+				prev = e;+			}+		}+	}++	public double get_baseline_to_bottom (Glyph g) {+		return get_scale (g) * (-g.baseline - g.bottom_limit);+	}++	public double get_scale (Glyph g) {+		double s = g.top_limit - g.bottom_limit;+		+		if (s == 0) {+			s = cached_font.top_limit - cached_font.bottom_limit;+		}+		+		return font_size / s;+	}++	public double get_font_scale () {+		return font_size / (cached_font.top_limit - cached_font.bottom_limit);+	}++	public double get_baseline_to_bottom_for_font () {+		return get_font_scale () * (-cached_font.base_line - cached_font.bottom_limit);+	}+	+	public void truncate (double max_width) {+		truncated_width = max_width;+	}+}++}diff --git a/libbirdfont/Renderer/TextArea.vala b/libbirdfont/Renderer/TextArea.valanew file mode 100644index 0000000..797c52c--- /dev/null+++ b/libbirdfont/Renderer/TextArea.vala@@ -0,0 +1,1665 @@+/*+	Copyright (C) 2014 Johan Mattsson++	This library is free software; you can redistribute it and/or modify +	it under the terms of the GNU Lesser General Public License as +	published by the Free Software Foundation; either version 3 of the +	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but +	WITHOUT ANY WARRANTY; without even the implied warranty of +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +	Lesser General Public License for more details.+*/++using Cairo;+using Math;++namespace BirdFont {++public class TextArea : Widget {+	+	public double min_width = 500;+	public double min_height = 100;+	public double font_size;+	public double padding = 3.3;+	public bool single_line = false;+	public Color text_color = Color.black ();+	+	public bool draw_carret {+		get { return carret_is_visible; }+		set { +			carret_is_visible = value; +			if (!value) {+				update_selection = false;+				selection_end = carret.copy ();+			}+		}+	}+	public bool carret_is_visible = false;+	public bool draw_border = true;++	public double width;+	public double height;+	+	Carret carret = new Carret ();+	Carret selection_end = new Carret ();+	bool update_selection = false;+	public bool show_selection = false;+	+	public signal void scroll (double pixels);+	public signal void text_changed (string text);+	public signal void enter (string text);+	+	Gee.ArrayList<Paragraph> paragraphs = new Gee.ArrayList<Paragraph>  ();+	private static const int DONE = -2; +	+	int last_paragraph = 0;+	string text;+	int text_length;+	+	Gee.ArrayList<TextUndoItem> undo_items = new Gee.ArrayList<TextUndoItem> ();+	Gee.ArrayList<TextUndoItem> redo_items = new Gee.ArrayList<TextUndoItem> ();+	+	bool store_undo_state_at_next_event = false;+	+	public bool editable;+	+	public TextArea (double font_size = 20, Color? c = null) {+		this.font_size = font_size;+		width = min_width;+		height = min_height;+		editable = true;+		+		if (c != null) {+			text_color = (!) c;+		}+	}++	public override void focus (bool focus) {+		draw_carret = focus;+	}++	public override double get_height () {+		return height + 2 * padding;+	}++	public override double get_width () {+		return width + 2 * padding;+	}++	public void set_font_size (double z) {+		font_size = z;+	}+	+	bool generate_paragraphs () {+		Paragraph paragraph;++		int next_paragraph = -1;+		+		if (is_null (text)) {+			warning ("No text");+			return false;+		}+		+		if (last_paragraph == DONE) {+			return false;+		}+	+		next_paragraph = text.index_of ("\n", last_paragraph);+		+		if (next_paragraph == -1) {+			paragraph = new Paragraph (text.substring (last_paragraph), font_size, paragraphs.size, text_color);+			paragraphs.add (paragraph);+			last_paragraph = DONE;+		} else {+			next_paragraph +=  "\n".length;+			paragraph = new Paragraph (text.substring (last_paragraph, next_paragraph - last_paragraph), font_size, paragraphs.size, text_color);+			paragraphs.add (paragraph);+			last_paragraph = next_paragraph;+		}+		+		return last_paragraph != DONE;+	}+	+	void generate_all_paragraphs () {+		while (generate_paragraphs ()) {+		}+	}+	+	public override void key_press (uint keyval) {+		unichar c;+		TextUndoItem ui;+		+		if (!editable) {+			return;+		}+		+		c = (unichar) keyval;+		+		switch (c) {+			case ' ':+				store_undo_edit_state ();+				add_character (keyval);+				break;+			case 'a':+				if (KeyBindings.has_ctrl () || KeyBindings.has_logo ()) {+					select_all ();+				} else {+					add_character (keyval);+				}+				break;+			case 'c':+				if (KeyBindings.has_ctrl () || KeyBindings.has_logo ()) {+					ClipTool.copy_text (this);+				} else {+					add_character (keyval);+				}+				break;+			case 'v':+				if (KeyBindings.has_ctrl () || KeyBindings.has_logo ()) {+					ClipTool.paste_text (this);+					store_undo_state_at_next_event = true;+				} else {+					add_character (keyval);+				}+				break;+			case 'y':+				if (KeyBindings.has_ctrl () || KeyBindings.has_logo ()) {+					redo ();+				} else {+					add_character (keyval);+				}+				break;+			case 'z':+				if (KeyBindings.has_ctrl () || KeyBindings.has_logo ()) {+					undo ();+				} else {+					add_character (keyval);+				}+				break;+			case Key.RIGHT:+				check_selection ();+				move_carret_next ();+				break;+			case Key.LEFT:+				check_selection ();+				move_carret_previous ();+				break;+			case Key.DOWN:+				check_selection ();+				move_carret_next_row ();+				break;+			case Key.UP:+				check_selection ();+				move_carret_previous_row ();+				break;+			case Key.END:+				check_selection ();+				move_carret_to_end_of_line ();+				break;+			case Key.HOME:+				check_selection ();+				move_carret_to_beginning_of_line ();+				break;+			case Key.BACK_SPACE:+				if (has_selection ()) {+					ui = delete_selected_text ();+					undo_items.add (ui);+					redo_items.clear ();+					store_undo_state_at_next_event = true;+				} else {+					ui = remove_last_character ();+					undo_items.add (ui);+					redo_items.clear ();+					store_undo_state_at_next_event = true;+				}+				text_changed (get_text ());+				break;+			case Key.ENTER:+				store_undo_edit_state ();+				insert_text ("\n");+				+				if (single_line) {+					enter (get_text ());+				}+				break;+			case Key.DEL:+				if (has_selection ()) {+					ui = delete_selected_text ();+					undo_items.add (ui);+					redo_items.clear ();+					store_undo_state_at_next_event = true;+				} else {+					ui = remove_next_character ();+					undo_items.add (ui);+					redo_items.clear ();+					store_undo_state_at_next_event = true;+				}+				text_changed (get_text ());+				break;		+			default:+				if (!KeyBindings.has_ctrl () && !KeyBindings.has_logo ()) {+					add_character (keyval);+				} +				break;+		}+			+		GlyphCanvas.redraw ();+	}+	+	void check_selection () {+		if (!has_selection () && KeyBindings.has_shift ()) {+			show_selection = true;+			selection_end = carret.copy ();+		}+		+		if (!KeyBindings.has_shift ()) {+			show_selection = false;+		}+	}+	+	private void add_character (uint keyval) {+		unichar c = (unichar) keyval;+		string s;++		if (!is_modifier_key (keyval) +			&& !KeyBindings.has_ctrl ()+			&& !KeyBindings.has_alt ()) {+			+			s = (!) c.to_string ();		+			+			if (s.validate ()) {				+				if (store_undo_state_at_next_event) {+					store_undo_edit_state ();+					store_undo_state_at_next_event = false;+				}+				+				insert_text (s);+			}+		}+	}++	Paragraph get_current_paragraph () {+		Paragraph p;+		+		if (unlikely (!(0 <= carret.paragraph < paragraphs.size))) {+			warning (@"No paragraph, index: $(carret.paragraph), size: $(paragraphs.size)");+			p = new Paragraph ("", 0, 0, text_color);+			paragraphs.add (p);+			return p;+		}+		+		p = paragraphs.get (carret.paragraph);+		return p;+	}++	public void set_text (string t) {+		int tl;+		+		if (single_line) {+			text = t.replace ("\n", "").replace ("\r", "");+		} else {+			text = t;+		}+		+		tl = t.length;		+		text_length += tl;+		+		paragraphs.clear ();+		generate_paragraphs ();+		+		return_if_fail (paragraphs.size != 0);+		+		carret.paragraph = paragraphs.size - 1;+		carret.character_index = paragraphs.get (paragraphs.size - 1).text.length;+		selection_end = carret.copy ();+		show_selection = false;+		+		text_changed (get_text ());+	}+	+	Carret get_selection_start () {+		if (carret.paragraph == selection_end.paragraph) {+			return carret.character_index < selection_end.character_index ? carret : selection_end;+		}+		+		return carret.paragraph < selection_end.paragraph ? carret : selection_end;	+	}++	Carret get_selection_stop () {+		if (carret.paragraph == selection_end.paragraph) {+			return carret.character_index > selection_end.character_index ? carret : selection_end;+		}+		+		return carret.paragraph > selection_end.paragraph ? carret : selection_end;		+	}+		+	public string get_selected_text () {+		Carret selection_start, selection_stop;+		int i;+		Paragraph pg;+		StringBuilder sb;+		+		sb = new StringBuilder ();+		+		if (!has_selection ()) {+			return "".dup ();+		}+		+		selection_start = get_selection_start ();+		selection_stop = get_selection_stop ();+		+		if (selection_start.paragraph == selection_stop.paragraph) {+			pg = paragraphs.get (selection_start.paragraph);+			return pg.text.substring (selection_start.character_index, selection_stop.character_index - selection_start.character_index);+		}+		+		pg = paragraphs.get (selection_start.paragraph);+		sb.append (pg.text.substring (selection_start.character_index));+		+		for (i = selection_start.paragraph + 1; i < selection_stop.paragraph; i++) {+			return_val_if_fail (0 <= i < paragraphs.size, "".dup ());+			pg = paragraphs.get (i);+			sb.append (pg.text);+		}++		pg = paragraphs.get (selection_stop.paragraph);+		sb.append (pg.text.substring (0, selection_stop.character_index));+				+		return sb.str;+	}+	+	public void select_all () {+		while (last_paragraph != DONE) {+			generate_paragraphs ();+		}+			+		if (paragraphs.size > 0) {+			carret.paragraph = 0;+			carret.character_index = 0;+			selection_end.paragraph = paragraphs.size - 1;+			selection_end.character_index = paragraphs.get (paragraphs.size - 1).text_length;+			show_selection = true;+		}+	}+	+	public TextUndoItem delete_selected_text () {+		Carret selection_start, selection_stop;+		int i;+		Paragraph pg, pge;+		string e, s, n;+		bool same;+		TextUndoItem ui;+		+		ui = new TextUndoItem (carret);+		+		e = "";+		s = "";+		n = "";+		+		if (!has_selection ()) {+			warning ("No selected text.");+			return ui;+		}+		+		selection_start = get_selection_start ();+		selection_stop = get_selection_stop ();+		+		same = selection_start.paragraph == selection_stop.paragraph;+		+		if (!same) {+			return_val_if_fail (0 <= selection_start.paragraph < paragraphs.size, ui);+			pg = paragraphs.get (selection_start.paragraph);+			s = pg.text.substring (0, selection_start.character_index);++			return_val_if_fail (0 <= selection_stop.paragraph < paragraphs.size, ui);+			pge = paragraphs.get (selection_stop.paragraph);+			e = pge.text.substring (selection_stop.character_index);+							+			if (!s.has_suffix ("\n")) {+				ui.deleted.add (pge.copy ());+				ui.edited.add (pg.copy ());+				+				pg.set_text (s + e);+				pge.set_text ("");+			} else {+				ui.edited.add (pg.copy ());+				ui.edited.add (pge.copy ());+				+				pg.set_text (s);+				pge.set_text (e);+			}+		} else {+			return_val_if_fail (0 <= selection_start.paragraph < paragraphs.size, ui);+			+			pg = paragraphs.get (selection_start.paragraph);+			n = pg.text.substring (0, selection_start.character_index);+			n += pg.text.substring (selection_stop.character_index);+			+			if (n == "") {+				ui.deleted.add (pg.copy ());+				paragraphs.remove_at (selection_start.paragraph);+			} else {+				ui.edited.add (pg.copy ());+			}+			+			pg.set_text (n);+		}+		+		if (e == "" && !same) {+			paragraphs.remove_at (selection_stop.paragraph);+		}+		+		for (i = selection_stop.paragraph - 1; i > selection_start.paragraph; i--) {+			return_val_if_fail (0 <= i < paragraphs.size, ui);+			ui.deleted.add (paragraphs.get (i));+			paragraphs.remove_at (i);+		}+		+		if (s == "" && !same) {+			return_val_if_fail (0 <= selection_start.paragraph < paragraphs.size, ui);+			paragraphs.remove_at (selection_start.paragraph);+		}+		+		carret = selection_start.copy ();+		selection_end = carret.copy ();+				+		show_selection = false;+		update_paragraph_index ();+		layout ();+		+		return ui;+	}+	+	void update_paragraph_index () {+		int i = 0;+		foreach (Paragraph p in paragraphs) {+			p.index = i;+			i++;+		}+	}+	+	public TextUndoItem remove_last_character () {+		TextUndoItem ui;+		move_carret_previous ();+		ui = remove_next_character ();+		return ui;+	}+	+	public TextUndoItem remove_next_character () {+		Paragraph paragraph;+		Paragraph next_paragraph;+		int index;+		unichar c;+		string np;+		TextUndoItem ui;+		+		ui = new TextUndoItem (carret);+		+		return_val_if_fail (0 <= carret.paragraph < paragraphs.size, ui);+		paragraph = paragraphs.get (carret.paragraph);+		+		index = carret.character_index;+	+		paragraph.text.get_next_char (ref index, out c);+		+		if (index >= paragraph.text_length) {+			np = paragraph.text.substring (0, carret.character_index);+			+			if (carret.paragraph + 1 < paragraphs.size) {+				next_paragraph = paragraphs.get (carret.paragraph + 1);+				paragraphs.remove_at (carret.paragraph + 1);+				+				np = np + next_paragraph.text;+				+				ui.deleted.add (next_paragraph);+			}+			+			paragraph.set_text (np);+			ui.edited.add (paragraph);+		} else {+			np = paragraph.text.substring (0, carret.character_index) + paragraph.text.substring (index);+			paragraph.set_text (np);++			if (np == "") {+				return_val_if_fail (carret.paragraph > 0, ui);+				carret.paragraph--;+				paragraph = paragraphs.get (carret.paragraph);+				carret.character_index = paragraph.text_length;+				+				ui.deleted.add (paragraphs.get (carret.paragraph + 1));+				+				paragraphs.remove_at (carret.paragraph + 1);+			} else {+				ui.edited.add (paragraph);+			}+		}+		+		update_paragraph_index ();+		layout ();++		return ui;+	}+	+	public void move_carret_next () {+		unichar c;+		+		move_carret_one_character ();+		+		if (KeyBindings.has_ctrl ()) {+			while (true) {+				c = move_carret_one_character ();+				+				if (c == '\0' || c == ' ') {+					break;+				}+			}+		}+	}+	+	unichar move_carret_one_character () {+		Paragraph paragraph;+		int index;+		unichar c;+		+		return_val_if_fail (0 <= carret.paragraph < paragraphs.size, '\0');+		paragraph = paragraphs.get (carret.paragraph);+		+		index = carret.character_index;+		+		paragraph.text.get_next_char (ref index, out c);+		+		if (index >= paragraph.text_length && carret.paragraph + 1 < paragraphs.size) {+			carret.paragraph++;+			carret.character_index = 0;+			c = ' ';+		} else {+			carret.character_index = index;+		}+		+		return c;	+	}++	public void move_carret_previous () {+		unichar c;+		+		move_carret_back_one_character ();+		+		if (KeyBindings.has_ctrl ()) {+			while (true) {+				c = move_carret_back_one_character ();+				+				if (c == '\0' || c == ' ') {+					break;+				}+			}+		}+	}+	+	unichar move_carret_back_one_character () {+		Paragraph paragraph;+		int index, last_index;+		unichar c;+		+		return_val_if_fail (0 <= carret.paragraph < paragraphs.size, '\0');+		paragraph = paragraphs.get (carret.paragraph);+		+		index = 0;+		last_index = -1;+		+		while (paragraph.text.get_next_char (ref index, out c) && index < carret.character_index) {+			last_index = index;+		}+		+		if (last_index <= 0 && carret.paragraph > 0) {+			carret.paragraph--;+			+			return_val_if_fail (0 <= carret.paragraph < paragraphs.size, '\0');+			paragraph = paragraphs.get (carret.paragraph);+			carret.character_index = paragraph.text_length;+			+			if (paragraph.text.has_suffix ("\n")) {+				carret.character_index -= "\n".length;+			}+			+			c = ' ';+		} else if (last_index > 0) {+			carret.character_index = last_index;+		} else {+			carret.character_index = 0;+			c = ' ';+		}+		+		return_val_if_fail (0 <= carret.paragraph < paragraphs.size, '\0');+		+		return c;+	}+	+	public void move_carret_next_row () {+		double nr = font_size;+		+		if (carret.desired_y + 2 * font_size >= allocation.height) {+			scroll (2 * font_size);+			nr = -font_size;+		}+		+		if (carret.desired_y + nr < widget_y + height - padding) {+			carret = get_carret_at (carret.desired_x - widget_x - padding, carret.desired_y + nr);+		}+	}++	public void move_carret_to_end_of_line () {+		carret = get_carret_at (widget_x + padding + width, carret.desired_y, false);	+	}++	public void move_carret_to_beginning_of_line () {+		carret = get_carret_at (widget_x, carret.desired_y, false);	+	}+	+	public void move_carret_previous_row () {+		double nr = -font_size;+		+		if (carret.desired_y - 2 * font_size < 0) {+			scroll (-2 * font_size);+			nr = font_size;+		}+		+		if (carret.desired_y + nr > widget_y + padding) {+			carret = get_carret_at (carret.desired_x, carret.desired_y + nr);+		}+	}+	+	public bool has_selection () {+		return show_selection && selection_is_visible ();+	}+	+	private bool selection_is_visible () {+		return carret.paragraph != selection_end.paragraph || carret.character_index != selection_end.character_index;+	}+	+	public void insert_text (string t) {+		string s;+		Paragraph paragraph;+		TextUndoItem ui;+		Gee.ArrayList<string> pgs;+		bool u = false;+		+		pgs = new Gee.ArrayList<string> ();+		+		if (single_line) {+			s = t.replace ("\n", "").replace ("\r", "");+			pgs.add (s);+		} else {+			if (t.last_index_of ("\n") > 0) {+				string[] parts = t.split ("\n");+				int i;+				for (i = 0; i < parts.length -1; i++) {+					pgs.add (parts[i]);+					pgs.add ("\n");+				}++				pgs.add (parts[parts.length - 1]);+				+				if (t.has_suffix ("\n")) {+					pgs.add ("\n");+				}+			} else {+				s = t;+				pgs.add (s);+			}+		}+		+		if (has_selection () && show_selection) {+			ui = delete_selected_text ();+			u = true;+			+			if (paragraphs.size == 0) {+				paragraphs.add (new Paragraph ("", font_size, 0, text_color));+			}+		} else {+			ui = new TextUndoItem (carret);+		}+		+		return_if_fail (0 <= carret.paragraph < paragraphs.size);+		paragraph = paragraphs.get (carret.paragraph);+		+		if (pgs.size > 0) {+			if (!u) {+				ui.edited.add (paragraph.copy ());+			}+			+			string first = pgs.get (0);+			+			string end; +			string nt = paragraph.text.substring (0, carret.character_index);+			+			nt += first;+			end = paragraph.text.substring (carret.character_index);+		+			paragraph.set_text (nt);+			+			int paragraph_index = carret.paragraph;+			Paragraph next_paragraph = paragraph;+			for (int i = 1; i < pgs.size; i++) {+				paragraph_index++;+				string next = pgs.get (i);+				next_paragraph = new Paragraph (next, font_size, paragraph_index, text_color);+				paragraphs.insert (paragraph_index, next_paragraph);+				ui.added.add (next_paragraph);+				u = true;+			}++			carret.paragraph = paragraph_index;+			carret.character_index = next_paragraph.text.length;++			next_paragraph.set_text (next_paragraph.text + end);+		}+		+		if (u) {+			undo_items.add (ui);+			redo_items.clear ();+		}++		update_paragraph_index ();+		layout ();+				+		text_changed (get_text ());+		show_selection = false;+	}+	+	public string get_text () {+		StringBuilder sb = new StringBuilder ();+		+		generate_all_paragraphs ();+		+		foreach (Paragraph p in paragraphs) {+			sb.append (p.text);+		}++		return sb.str;+	}+	+	Carret get_carret_at (double click_x, double click_y, +		bool check_boundaries = true) {+			+		int i = 0;+		double tx, ty;+		double p;+		string w;+		int ch_index;+		double min_d = double.MAX;+		Carret c = new Carret ();+		double dt;++		c.paragraph = -1;+		c.desired_x = click_x;+		c.desired_y = click_y;+		+		foreach (Paragraph paragraph in paragraphs) {+			if (!check_boundaries || paragraph.text_is_on_screen (allocation, widget_y)) {+				ch_index = 0;++				if (paragraph.start_y + widget_y - font_size <= click_y <= paragraph.end_y + widget_y + font_size) { +					foreach (Text next_word in paragraph.words) {+						double tt_click = click_y - widget_y - padding + font_size;++						w = next_word.text;+						+						if (next_word.widget_y <= tt_click <= next_word.widget_y + font_size) {+							+							p = next_word.get_sidebearing_extent ();+								+							if ((next_word.widget_y <= tt_click <= next_word.widget_y + font_size)+								&& (next_word.widget_x + widget_x <= click_x <= next_word.widget_x + widget_x + padding + next_word.get_sidebearing_extent ())) {+														+								tx = widget_x + next_word.widget_x + padding;+								ty = widget_y + next_word.widget_y + padding;+								+								next_word.iterate ((glyph, kerning, last) => {+									double cw;+									int ci;+									double d;+									string gc = (!) glyph.get_unichar ().to_string ();+									+									d = Math.fabs (click_x - tx);+									+									if (d <= min_d) {+										min_d = d;+										c.character_index = ch_index;+										c.paragraph = i;+									}+									+									cw = (glyph.get_width ()) * next_word.get_font_scale () + kerning;+									ci = gc.length;+									+									tx += cw;+									ch_index += ci;+								});++								dt = Math.fabs (click_x - (tx + widget_x + padding));+								if (dt < min_d) {+									min_d = dt;+									c.character_index = ch_index;+									c.paragraph = i;+								}+							} else {+								dt = Math.fabs (click_x - (next_word.widget_x + widget_x + padding + next_word.get_sidebearing_extent ()));+								+								if (dt < min_d) {+									min_d = dt;+									c.character_index = ch_index + w.length;+									+									if (w.has_suffix ("\n")) {+										c.character_index -= "\n".length;+									}+									+									c.paragraph = i;+								}+							+								ch_index += w.length;+							}+						} else {+							ch_index += w.length;+						}+					}+				}+			}+			i++;+		}+		+		if (unlikely (c.paragraph < 0)) {+			c.paragraph = paragraphs.size > 0 ? paragraphs.size - 1 : 0;+			c.character_index = paragraphs.size > 0 ? paragraphs.get (c.paragraph).text.length : 0;+		}+		+		store_undo_state_at_next_event = true;+		+		return c;+	}+	+	/** @return offset to click in text. */+	public override void layout () {+		double p;+		double tx, ty;+		string w;+		double xmax = 0;+		int i = 0;+		double dd;+		+		tx = 0;+		ty = font_size;+		+		if (allocation.width <= 0 || allocation.height <= 0) {+			warning ("Parent widget allocation is not set.");+		}+		+		for (i = paragraphs.size - 1; i >= 0 && paragraphs.size > 1; i--) {+			if (unlikely (paragraphs.get (i).is_empty ())) {+				warning ("Empty paragraph.");+				paragraphs.remove_at (i);+				update_paragraph_index ();+			}+		}+		+		i = 0;+		foreach (Paragraph paragraph in paragraphs) {+			if (paragraph.need_layout +				|| (paragraph.text_area_width != width+					&& paragraph.text_is_on_screen (allocation, widget_y))) {+						+				paragraph.start_y = ty;+				paragraph.start_x = tx;+				+				paragraph.cached_surface = null;+				+				foreach (Text next_word in paragraph.words) {+					next_word.set_font_size (font_size);+					+					w = next_word.text;+					p = next_word.get_sidebearing_extent ();++					if (unlikely (p == 0)) {+						warning (@"Zero width word: $(w)");+					}++					if (w == "") {+						break;+					}++					if (w == "\n") {+						next_word.widget_x = tx;+						next_word.widget_y = ty;+						+						tx = 0;+						ty += next_word.font_size;+					} else {+						if (!single_line) {+							if (tx + p + 2 * padding > width || w == "\n") {+								tx = 0;+								ty += next_word.font_size;+							}+						}++						if (tx + p > xmax) {+							xmax = tx + p;+						}+												+						next_word.widget_x = tx;+						next_word.widget_y = ty;+						+						if (w != "\n") {+							tx += p;+						}+					}+				}++				if (tx > xmax) {+					xmax = tx;+				}+				+				paragraph.text_area_width = width;+				paragraph.width = xmax;+				paragraph.end_x = tx;+				paragraph.end_y = ty;+				paragraph.need_layout = false;+			}+				+			if (xmax > width) {+				break;+			}+								+			tx = paragraph.end_x;+			ty = paragraph.end_y;+			i++;+		}+		+		if (xmax > width) {+			this.width = xmax + 2 * padding;+			layout ();+			return;+		}+		+		this.height = fmax (min_height, ty + 2 * padding);++		if (last_paragraph != DONE) {+			this.height = (text_length / (double) last_paragraph) * ty + 2 * padding; // estimate height+		}+		+		if (ty + widget_y < allocation.height && last_paragraph != DONE) {+			generate_paragraphs ();+			layout ();+			return;+		}++		ty = font_size;+		tx = 0;+		+		foreach (Paragraph paragraph in paragraphs) {+			dd = ty - paragraph.start_y;+			+			if (dd != 0) {+				paragraph.start_y += dd;+				paragraph.end_y += dd;+				foreach (Text word in paragraph.words) {+					word.widget_y += dd;+				}+			}+						+			ty = paragraph.end_y;+		}+	}+	+	public override void button_press (uint button, double x, double y) {+		if (is_over (x, y)) {+			carret = get_carret_at (x, y);+			selection_end = carret.copy ();+			update_selection = true;+		}+	}++	public override void button_release (uint button, double x, double y) {+		update_selection = false;+		show_selection = selection_is_visible ();+	}+	+	public override bool motion (double x, double y) {+		if (update_selection) {+			selection_end = get_carret_at (x, y);+			show_selection = selection_is_visible ();+		}+		+		return update_selection;+	}+	+	public override void draw (Context cr) {+		Text word;+		double tx, ty;+		string w;+		double scale;+		double width;+		double x = widget_x;+		double y = widget_y;+		Carret selection_start, selection_stop;+		double carret_x;+		double carret_y;+		+		layout ();+		+		if (draw_border) {+			// background+			cr.save ();+			cr.set_line_width (1);+			Theme.color (cr, "Text Area Background");+			draw_rounded_rectangle (cr, x, y, this.width, this.height - padding, padding);+			cr.fill ();+			cr.restore ();+			+			// border+			cr.save ();+			cr.set_line_width (1);+			Theme.color (cr, "Foreground 1");+			draw_rounded_rectangle (cr, x, y, this.width, this.height - padding, padding);+			cr.stroke ();+			cr.restore ();+		}+		+		cr.save ();++		word = new Text ();+		+		width = this.width - padding;+		x += padding;+		scale = word.get_font_scale ();+		y += font_size;+		+		// draw selection background+		if (has_selection ()) {+			tx = 0;+			ty = 0;+			+			selection_start = get_selection_start ();+			selection_stop = get_selection_stop ();+			+			cr.save ();+			Theme.color (cr, "Highlighted 1");++			for (int i = selection_start.paragraph; i <= selection_stop.paragraph; i++) {+				return_if_fail (0 <= i < paragraphs.size);+				Paragraph pg = paragraphs.get (i);++				if (pg.text_is_on_screen (allocation, widget_y)) {+					int char_index = 0;+					+					foreach (Text next_word in pg.words) {+						double cw = next_word.get_sidebearing_extent ();+						bool paint_background = false;+						bool partial_start = false;+						bool partial_stop = false;+						int wl;+						+						w = next_word.text;+						wl = w.length;+						scale = next_word.get_font_scale ();+												+						if (selection_start.paragraph == selection_stop.paragraph) {+							partial_start = true;+							partial_stop = true;+						} else if (selection_start.paragraph < i < selection_stop.paragraph) {+							paint_background = true;+						} else if (selection_start.paragraph == i) {+							paint_background = true;+							partial_start = true;+						} else if (selection_stop.paragraph == i) {+							paint_background = char_index + wl < selection_stop.character_index;+							partial_stop = !paint_background;+						}+						+						if (paint_background && !(partial_start || partial_stop)) {	+							double selection_y = widget_y + next_word.widget_y + scale * -next_word.cached_font.bottom_limit - font_size;+							cr.rectangle (widget_x + padding + next_word.widget_x - 1, selection_y, cw + 1, font_size);+							cr.fill ();+						}+						+						if (partial_start || partial_stop) {+							int index = char_index;+							double bx = widget_x + padding + next_word.widget_x + (partial_start ? 0 : 1);+							+							next_word.iterate ((glyph, kerning, last) => {+								double cwi;+								int ci;+								bool draw = (index >= selection_start.character_index && partial_start && !partial_stop)+									|| (index < selection_stop.character_index && !partial_start && partial_stop)+									|| (selection_start.character_index <= index < selection_stop.character_index && partial_start && partial_stop);+								+								cwi = (glyph.get_width ()) * next_word.get_font_scale () + kerning;++								if (draw) {+									double selection_y = widget_y + next_word.widget_y + scale * -next_word.cached_font.bottom_limit - font_size;+									cr.rectangle (bx - 1, selection_y, cwi + 1, font_size);+									cr.fill ();+								}+								+								bx += cwi;+								ci = ((!) glyph.get_unichar ().to_string ()).length;+								index += ci;+							});+						}	+					+						char_index += w.length;	+					}+				}+			}+			+			cr.restore ();+		}++		tx = 0;+		ty = 0;	+		+		int first_visible = 0;+		int last_visible;+		int paragraphs_size = paragraphs.size;+		while (first_visible < paragraphs_size) {+			if (paragraphs.get (first_visible).text_is_on_screen (allocation, widget_y)) {+				break;+			}+			first_visible++;+		}+		+		last_visible = first_visible;+		while (last_visible < paragraphs_size) {+			if (!paragraphs.get (last_visible).text_is_on_screen (allocation, widget_y)) {+				last_visible++;+				break;+			}+			last_visible++;+		}	+		+		if (paragraphs_size == 0) {+			if (carret_is_visible) {+				draw_carret_at (cr, widget_x + padding, widget_y + font_size + padding);+			}+			+			return;+		}+		+		Context cc; // cached context+		Paragraph paragraph;+		paragraph = paragraphs.get (0);+		+		tx = paragraph.start_x;+		ty = paragraph.start_y;++		for (int i = first_visible; i < last_visible; i++) {+			paragraph = paragraphs.get (i);+			+			tx = paragraph.start_x;+			ty = paragraph.start_y;++			if (paragraph.cached_surface == null) {				+				paragraph.cached_surface = Screen.create_background_surface ((int) width + 2, paragraph.get_height () + (int) font_size + 2);+				cc = new Context ((!) paragraph.cached_surface);+				cc.scale (Screen.get_scale(), Screen.get_scale());+				+				foreach (Text next_word in paragraph.words) {+					if (next_word.text != "\n") {+						next_word.draw_at_top (cc, next_word.widget_x, next_word.widget_y - ty);+					}+				}+			}+			+			if (likely (paragraph.cached_surface != null)) {+				// FIXME: subpixel offset in text area+				Screen.paint_background_surface(cr, +					(!) paragraph.cached_surface,+					(int) (x + tx),+					(int) (widget_y + paragraph.start_y - font_size + padding));+			} else {+				warning ("No paragraph image.");+			}+		}++		if (carret_is_visible) {+			get_carret_position (carret, out carret_x, out carret_y);+			+			if (carret_y < 0) {+				draw_carret_at (cr, widget_x + padding, widget_y + font_size + padding);+			} else {+				draw_carret_at (cr, carret_x, carret_y);+			}+		}+		+		if (has_selection ()) {+			get_carret_position (selection_end, out carret_x, out carret_y);+			+			if (carret_y < 0) {+				draw_carret_at (cr, widget_x + padding, widget_y + font_size + padding);+			} else {+				draw_carret_at (cr, carret_x, carret_y);+			}+		}+	}+	+	void get_carret_position (Carret carret, out double carret_x, out double carret_y) {+		Paragraph paragraph;+		double tx;+		double ty;+		int ch_index;+		int wl;+		double pos_x, pos_y;++		ch_index = 0;++		carret_x = -1;+		carret_y = -1;++		return_if_fail (0 <= carret.paragraph < paragraphs.size);+		paragraph = paragraphs.get (carret.paragraph);++		pos_x = -1;+		pos_y = -1;+		+		foreach (Text next_word in paragraph.words) {+			string w = next_word.text;+			wl = w.length;++			if (carret.character_index == ch_index) {+				pos_x = next_word.widget_x + widget_x + padding;+				pos_y = widget_y + next_word.widget_y + next_word.get_baseline_to_bottom_for_font ();		+			} else if (carret.character_index >= ch_index + wl) {+				pos_x = next_word.widget_x + next_word.get_sidebearing_extent () + widget_x + padding;+				pos_y = widget_y + next_word.widget_y + next_word.get_baseline_to_bottom_for_font ();+				+				if (next_word.text.has_suffix ("\n")) {+					pos_x = widget_x + padding;+					pos_y += next_word.font_size;+				}+			} else if (ch_index < carret.character_index <= ch_index + wl) {+				tx = widget_x + next_word.widget_x;+				ty = widget_y + next_word.widget_y + next_word.get_baseline_to_bottom_for_font ();+		+				if (carret.character_index <= ch_index) {+					pos_x = widget_x + padding;+					pos_y = ty;+				}++				next_word.iterate ((glyph, kerning, last) => {+					double cw;+					int ci;++					cw = (glyph.get_width ()) * next_word.get_font_scale () + kerning;+					ci = ((!) glyph.get_unichar ().to_string ()).length;+					+					if (ch_index < carret.character_index <= ch_index + ci) {+						pos_x = tx + cw + padding;+						pos_y = ty;+						+						if (glyph.get_unichar () == '\n') {+							pos_x = widget_x + padding;+							pos_y += next_word.font_size;+						}+					}+					+					tx += cw;+					ch_index += ci;+				});+			}+			+			ch_index += wl;+		}+		+		carret_x = pos_x;+		carret_y = pos_y;+	}+	+	void draw_carret_at (Context cr, double x, double y) {+		cr.save ();+		cr.set_source_rgba (0, 0, 0, 0.5);+		cr.set_line_width (1);+		cr.move_to (x, y);+		cr.line_to (x, y - font_size);+		cr.stroke ();+		cr.restore ();	+	}++	public void store_undo_edit_state () {+		TextUndoItem ui = new TextUndoItem (carret);+		ui.edited.add (get_current_paragraph ().copy ());+		undo_items.add (ui);+		redo_items.clear ();+	}+	+	public void redo () {+		TextUndoItem i;+		TextUndoItem undo_item;+		+		if (redo_items.size > 0) {+			i = redo_items.get (redo_items.size - 1); +			+			undo_item = new TextUndoItem (i.carret);+			+			i.deleted.sort ((a, b) => {+				Paragraph pa = (Paragraph) a;+				Paragraph pb = (Paragraph) b;+				return pb.index - pa.index;+			});++			i.added.sort ((a, b) => {+				Paragraph pa = (Paragraph) a;+				Paragraph pb = (Paragraph) b;+				return pa.index - pb.index;+			});++			foreach (Paragraph p in i.deleted) {+				if (unlikely (!(0 <= p.index < paragraphs.size))) {+					warning ("Paragraph not found.");+				} else {+					undo_item.deleted.add (p.copy ());+					paragraphs.remove_at (p.index);+				}+			}+						+			foreach (Paragraph p in i.added) {+				if (p.index == paragraphs.size) {+					paragraphs.add (p.copy ());+				} else {+					if (unlikely (!(0 <= p.index < paragraphs.size))) {+						warning (@"Index: $(p.index) out of bounds, size: $(paragraphs.size)");+					} else {+						undo_item.added.add (paragraphs.get (p.index).copy ());+						paragraphs.insert (p.index, p.copy ());+					}+				}+			}++			foreach (Paragraph p in i.edited) {+				if (unlikely (!(0 <= p.index < paragraphs.size))) {+					warning (@"Index: $(p.index ) out of bounds, size: $(paragraphs.size)");+					return;+				}+				+				undo_item.edited.add (paragraphs.get (p.index).copy ());+				paragraphs.set (p.index, p.copy ());+			}			+			+			redo_items.remove_at (redo_items.size - 1);+			undo_items.add (undo_item);+			+			carret = i.carret.copy ();+			layout ();+		}+	}+	+	public void undo () {+		TextUndoItem i;+		TextUndoItem redo_item;+		+		if (undo_items.size > 0) {+			i = undo_items.get (undo_items.size - 1); +			redo_item = new TextUndoItem (i.carret);+			+			i.deleted.sort ((a, b) => {+				Paragraph pa = (Paragraph) a;+				Paragraph pb = (Paragraph) b;+				return pa.index - pb.index;+			});++			i.added.sort ((a, b) => {+				Paragraph pa = (Paragraph) a;+				Paragraph pb = (Paragraph) b;+				return pb.index - pa.index;+			});+			+			foreach (Paragraph p in i.added) {+				if (unlikely (!(0 <= p.index < paragraphs.size))) {+					warning ("Paragraph not found.");+				} else {+					redo_item.added.add (paragraphs.get (p.index).copy ());+					paragraphs.remove_at (p.index);+				}+			}+						+			foreach (Paragraph p in i.deleted) {+				if (p.index == paragraphs.size) {+					paragraphs.add (p.copy ());+				} else {+					if (unlikely (!(0 <= p.index < paragraphs.size))) {+						warning (@"Index: $(p.index) out of bounds, size: $(paragraphs.size)");+					} else {+						redo_item.deleted.add (p.copy ());+						paragraphs.insert (p.index, p.copy ());+					}+				}+			}++			foreach (Paragraph p in i.edited) {+				if (unlikely (!(0 <= p.index < paragraphs.size))) {+					warning (@"Index: $(p.index ) out of bounds, size: $(paragraphs.size)");+					return;+				}+				+				redo_item.edited.add (paragraphs.get (p.index).copy ());+				paragraphs.set (p.index, p.copy ());+			}			+			+			undo_items.remove_at (undo_items.size - 1);+			redo_items.add (redo_item);+			+			carret = i.carret.copy ();+			layout ();+		}+	}+	+	public void set_editable (bool editable) {+		this.editable = editable;+	}+	+	public class TextUndoItem : GLib.Object {+		public Carret carret;+		public Gee.ArrayList<Paragraph> added = new Gee.ArrayList<Paragraph> ();+		public Gee.ArrayList<Paragraph> edited = new Gee.ArrayList<Paragraph> ();+		public Gee.ArrayList<Paragraph> deleted = new Gee.ArrayList<Paragraph> ();+		+		public TextUndoItem (Carret c) {+			carret = c.copy ();+		}+	}+		+	public class Paragraph : GLib.Object {+		public double end_x = -10000;+		public double end_y = -10000;+		+		public double start_x = -10000;+		public double start_y = -10000;+		+		public double width = -10000;+		public double text_area_width = -10000;+		+		public string text;+		+		public Gee.ArrayList<Text> words {+			get {+				if (words_in_paragraph.size == 0) {+					generate_words ();+				}+				+				return words_in_paragraph;+			}+		}+		+		private Gee.ArrayList<Text> words_in_paragraph = new Gee.ArrayList<Text> ();+		public int text_length;+		public bool need_layout = true;+		public Surface? cached_surface = null;+		double font_size;+		public int index;+		Color text_color;+		+		public Paragraph (string text, double font_size, int index, Color c) {+			this.index = index;+			this.font_size = font_size;+			text_color = c;+			set_text (text);+		}++		public Paragraph copy () {+			Paragraph p = new Paragraph (text.dup (), font_size, index, text_color);+			p.need_layout = true;+			return p;+		}++		public bool is_empty () {+			return text == "";+		}++		public void set_text (string t) {+			this.text = t;+			text_length = t.length;+			need_layout = true;+			words.clear ();+			cached_surface = null;+		}++		public int get_height () {+			return (int) (end_y - start_y) + 1;+		}+		+		public int get_width () {+			return (int) width + 1;+		}+		+		public bool text_is_on_screen (WidgetAllocation alloc, double widget_y) {+			bool v = (0 <= start_y + widget_y <= alloc.height)+				|| (0 <= end_y + widget_y <= alloc.height)+				|| (start_y + widget_y <= 0 && alloc.height <= end_y + widget_y);+			return v;+		}++		private void generate_words () {+			string w;+			int p = 0;+			bool carret_at_word_end = false;+			Text word;+			int carret = 0;+			int iter_pos = 0;++			return_if_fail (words_in_paragraph.size == 0);++			while (p < text_length) {+				w = get_next_word (out carret_at_word_end, ref iter_pos, carret);+				+				if (w == "") {+					break;+				}+				+				word = new Text (w, font_size);+				+				word.r = text_color.r;+				word.g = text_color.g;+				word.b = text_color.b;+				word.a = text_color.a;+				+				words_in_paragraph.add (word);+			}+		}++		string get_next_word (out bool carret_at_end_of_word, ref int iter_pos, int carret) {+			int i;+			int ni;+			int pi;+			string n;+			int nl;+			+			carret_at_end_of_word = false;+			+			if (iter_pos >= text_length) {+				carret_at_end_of_word = true;+				return "".dup ();+			}+			+			if (text.get_char (iter_pos) == '\n') {+				iter_pos += "\n".length;+				carret_at_end_of_word = (iter_pos == carret);+				return "\n".dup ();+			}+			+			i = text.index_of (" ", iter_pos);+			pi = i + " ".length;+			+			ni = text.index_of ("\t", iter_pos);+			if (ni != -1 && ni < pi || i == -1) {+				i = ni;+				pi = i  + "\t".length;+			}+			+			ni = text.index_of ("\n", iter_pos);+			if (ni != -1 && ni < pi || i == -1) {+				i = ni;+				pi = i;+			}+			+			if (iter_pos + iter_pos - pi > text_length || i == -1) {+				n = text.substring (iter_pos);+			} else {+				n = text.substring (iter_pos, pi - iter_pos);+			}+			+			nl = n.length;+			if (iter_pos < carret < iter_pos + nl) {+				n = text.substring (iter_pos, carret - iter_pos);+				nl = n.length;+				carret_at_end_of_word = true;+			}+			+			iter_pos += nl;+			+			if (iter_pos == carret) {+				carret_at_end_of_word = true;+			}+			+			return n;+		}+	}+	+	public class Carret : GLib.Object {+		+		public int paragraph = 0;+		+		public int character_index {+			get { +				return ci;+			}+			+			set { +				ci = value;+			}+		}+		+		private int ci = 0;+		+		public double desired_x = 0;+		public double desired_y = 0;+		+		public Carret () {+		}+		+		public void print () {+			stdout.printf (@"paragraph: $paragraph, character_index: $character_index\n");+		}+		+		public Carret copy () {+			Carret c = new Carret ();+			+			c.paragraph = paragraph;+			c.character_index = character_index;+			+			c.desired_x = desired_x;+			c.desired_y = desired_y;+			+			return c;+		}+	}+}++}diff --git a/libbirdfont/Renderer/fontconfig.c b/libbirdfont/Renderer/fontconfig.cnew file mode 100644index 0000000..f02b747--- /dev/null+++ b/libbirdfont/Renderer/fontconfig.c@@ -0,0 +1,140 @@+/*+	Copyright (C) 2015 Johan Mattsson++	This library is free software; you can redistribute it and/or modify +	it under the terms of the GNU Lesser General Public License as +	published by the Free Software Foundation; either version 3 of the +	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but +	WITHOUT ANY WARRANTY; without even the implied warranty of +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +	Lesser General Public License for more details.+*/++#include <stdio.h>+#include <glib.h>+#include <fontconfig/fontconfig.h>++gchar* find_font_with_property (FcConfig* fontconfig, const gchar* characters, const gchar* property) {+	FcPattern* pattern;+	FcCharSet* character_set;+	FcObjectSet* font_properties;+	FcFontSet* fonts;+	FcPattern* font;+	FcChar8* path;+	gchar* result;+	gchar* remaining_characters;+	gunichar character;+	+	if (fontconfig == NULL) {+		g_warning("Font config not loaded.");+		return NULL;+	}+	+	result = NULL;+	pattern = FcPatternCreate ();+	+	character_set = FcCharSetCreate ();+	+	remaining_characters = (gchar*) characters;+	while (TRUE) {+		character = g_utf8_get_char (remaining_characters);+		+		if (character == '\0') {+			break;+		}+		+		FcCharSetAddChar(character_set, character);+				+		remaining_characters = g_utf8_next_char (remaining_characters);+	}++	FcPatternAddCharSet (pattern, FC_CHARSET, character_set);+	FcCharSetDestroy (character_set);+	FcPatternAddInteger (pattern, FC_SLANT, FC_SLANT_ROMAN);+	+	FcPatternAddBool(pattern, FC_SCALABLE, FcTrue);+	font_properties = FcObjectSetBuild (property, NULL);	+	fonts = FcFontList (fontconfig, pattern, font_properties);+	+	if (fonts && fonts->nfont > 0) {+		font = fonts->fonts[0];+		if (FcPatternGetString(font, property, 0, &path) == FcResultMatch) {+			result = g_strdup ((gchar*) path);+		}+	}++	if (fonts) {+		FcFontSetDestroy(fonts);+	}++	if (pattern) {+		FcPatternDestroy(pattern);+	}++	return result;+}++/** Find a fallback font for a set of characters.+ * @return A path to the font file.+ */+gchar* find_font (FcConfig* fontconfig, const gchar* characters) {+	return find_font_with_property (fontconfig, characters, FC_FILE);+}++/** Find a fallback font for a set of characters.+ * @return Family name of the font.+ */+gchar* find_font_family (FcConfig* fontconfig, const gchar* characters) {+	return find_font_with_property (fontconfig, characters, FC_FAMILY);+}++/** Find a font file from its family name.+ * @param font_config fontconfig instance+ * @param font_name name of the font+ * @return full path to the font file+ */+gchar* find_font_file (FcConfig* font_config, const gchar* font_name) {+	const FcChar8* name;+	FcPattern* search_pattern;+	FcPattern* font;+	FcChar8* file;+	gchar* path;+	FcObjectSet* font_properties;+	FcFontSet* fonts;+	int i;++	if (font_config == NULL) {+		g_warning("Font config not loaded.");+		return NULL;+	}+	+	path = NULL;+	name = font_name;++	search_pattern = FcPatternCreate ();+	FcPatternAddString (search_pattern, FC_FAMILY, name);+	FcPatternAddBool (search_pattern, FC_SCALABLE, FcTrue);+	FcPatternAddInteger (search_pattern, FC_WEIGHT, FC_WEIGHT_MEDIUM);+	FcPatternAddInteger (search_pattern, FC_SLANT, FC_SLANT_ROMAN);+		+	font_properties = FcObjectSetBuild (FC_FILE, NULL);+	fonts = FcFontList (font_config, search_pattern, font_properties);+	+	if (fonts->nfont > 0) {+		for (i = 0; i < fonts->nfont; i++) {+			font = fonts->fonts[i];+			+			if (FcPatternGetString(font, FC_FILE, 0, &file) == FcResultMatch) {+				path = g_strdup ((gchar*) file);+				break;+			}+		}+		FcPatternDestroy (font);+	}++	FcPatternDestroy (search_pattern);+	+	return path;+}diff --git a/libbirdfont/ResizeTool.vala b/libbirdfont/ResizeTool.valaindex e685152..8e22ca1 100644--- a/libbirdfont/ResizeTool.vala+++ b/libbirdfont/ResizeTool.vala@@ -14,7 +14,6 @@  using Math; using Cairo;-using SvgBird;  namespace BirdFont { @@ -22,7 +21,7 @@ public class ResizeTool : Tool { 	bool resize_path_proportional = false; 	bool resize_width = false; -	SvgBird.Object? resized_path = null;+	Path? resized_path = null; 	double last_resize_y; 	double last_resize_x; @@ -64,13 +63,13 @@ public class ResizeTool : Tool { 		}); 				 		press_action.connect((self, b, x, y) => {-			SvgBird.Object last_path;+			Path last_path; 			Glyph glyph; 			 			glyph = MainWindow.get_current_glyph (); 			glyph.store_undo_state (); 			-			foreach (SvgBird.Object p in glyph.active_paths) {+			foreach (Path p in glyph.active_paths) { 				if (is_over_resize_handle (p, x, y)) { 					resize_path_proportional = true; 					resized_path = p;@@ -88,7 +87,7 @@ public class ResizeTool : Tool { 				} 			} -			foreach (SvgBird.Object p in glyph.active_paths) {+			foreach (Path p in glyph.active_paths) { 				if (is_over_rotate_handle (p, x, y)) { 					rotate_path = true; 					return;@@ -122,11 +121,8 @@ public class ResizeTool : Tool { 			update_selection_box (); 			GlyphCanvas.redraw (); 			-			foreach (SvgBird.Object p in MainWindow.get_current_glyph ().active_paths) {-				if (p is PathObject) {-					PathObject path = (PathObject) p;-					path.get_path ().create_full_stroke ();-				}+			foreach (Path p in MainWindow.get_current_glyph ().active_paths) {+				p.create_full_stroke (); 			} 		}); 		@@ -155,6 +151,10 @@ public class ResizeTool : Tool { 				 				glyph = MainWindow.get_current_glyph (); 				+				foreach (Path selected_path in glyph.active_paths) {+					selected_path.reset_stroke ();+				}+				 				GlyphCanvas.redraw (); 			} 			@@ -234,9 +234,9 @@ public class ResizeTool : Tool { 	public void rotate_selected_paths (double angle, double cx, double cy) { 		Glyph glyph = MainWindow.get_current_glyph ();   		double dx, dy, xc2, yc2, w, h;-		SvgBird.Object last_path;+		Path last_path; 		-		foreach (SvgBird.Object p in glyph.active_paths) {+		foreach (Path p in glyph.active_paths) { 			p.rotate (angle, cx, cy); 		} @@ -245,7 +245,7 @@ public class ResizeTool : Tool { 		dx = -(xc2 - cx); 		dy = -(yc2 - cy); 		-		foreach (SvgBird.Object p in glyph.active_paths) {+		foreach (Path p in glyph.active_paths) { 			p.move (dx, dy); 		} 		@@ -287,7 +287,7 @@ public class ResizeTool : Tool { 		rotate_selected_paths (rotation - last_rotate, selection_box_center_x, selection_box_center_y); 	} -	static bool is_over_rotate_handle (SvgBird.Object p, double x, double y) {+	static bool is_over_rotate_handle (Path p, double x, double y) { 		double cx, cy, hx, hy; 		double size = 10; 		bool inx, iny;@@ -364,16 +364,17 @@ public class ResizeTool : Tool { 		if (!selected) { 			glyph.clear_active_paths (); 			-			foreach (SvgBird.Object path in glyph.get_visible_objects ()) {-				glyph.add_active_object (null, path);+			foreach (Path path in glyph.get_visible_paths ()) {+				glyph.add_active_path (null, path); 			} 		} 		 		get_selection_min (out resize_pos_x, out resize_pos_y); 		 		// resize paths-		foreach (SvgBird.Object selected_path in glyph.active_paths) {+		foreach (Path selected_path in glyph.active_paths) { 			selected_path.resize (ratio_x, ratio_y);+			selected_path.reset_stroke (); 		} 		 		// move paths relative to the updated xmin and xmax@@ -381,7 +382,7 @@ public class ResizeTool : Tool { 		dx = resize_pos_x - selection_minx; 		dy = resize_pos_y - selection_miny; 		-		foreach (SvgBird.Object selected_path in glyph.active_paths) {+		foreach (Path selected_path in glyph.active_paths) { 			selected_path.move (dx, dy);			 		} 		@@ -469,7 +470,7 @@ public class ResizeTool : Tool { 		 		DrawingTools.move_tool.move_to_baseline (); -		foreach (SvgBird.Object path in glyph.active_paths) {+		foreach (Path path in glyph.active_paths) { 			path.move (0, -descender * scale); 		} 		@@ -480,7 +481,7 @@ public class ResizeTool : Tool { 		Glyph glyph = MainWindow.get_current_glyph (); 		x = double.MAX; 		y = double.MAX;-		foreach (SvgBird.Object p in glyph.active_paths) {+		foreach (Path p in glyph.active_paths) { 			if (p.xmin < x) { 				x = p.xmin; 			}@@ -496,11 +497,11 @@ public class ResizeTool : Tool { 		double h, w; 		double ratio = get_resize_ratio (x, y); 		-		foreach (SvgBird.Object selected_path in glyph.active_paths) {+		foreach (Path selected_path in glyph.active_paths) { 			h = selected_path.ymax - selected_path.ymin; 			w = selected_path.xmax - selected_path.xmin; 			-			if (selected_path.is_empty ()) { // FIXME: test with one point+			if (selected_path.points.size <= 1) { 				continue; 			} 			@@ -512,13 +513,13 @@ public class ResizeTool : Tool { 		return true; 	} -	bool is_over_resize_handle (SvgBird.Object p, double x, double y) {+	bool is_over_resize_handle (Path p, double x, double y) { 		double handle_x, handle_y; 		get_resize_handle_position (out handle_x, out handle_y); 		return Path.distance (handle_x, x, handle_y, y) < 12 * MainWindow.units; 	} -	bool is_over_horizontal_resize_handle (SvgBird.Object p, double x, double y) {+	bool is_over_horizontal_resize_handle (Path p, double x, double y) { 		double handle_x, handle_y; 		get_horizontal_reseize_handle_position (out handle_x, out handle_y); 		return Path.distance (handle_x, x, handle_y, y) < 12 * MainWindow.units;		@@ -539,28 +540,26 @@ public class ResizeTool : Tool { 		if (!selected_paths) { 			glyph.clear_active_paths (); 			-			foreach (SvgBird.Object path in glyph.get_visible_objects ()) {-				glyph.add_active_object (null, path);+			foreach (Path path in glyph.get_visible_paths ()) {+				glyph.add_active_path (null, path); 			} 		}  		glyph.selection_boundaries (out x, out y, out w, out h); 	-		foreach (SvgBird.Object path in glyph.active_paths) {-			if (path is PathObject) { // FIXME: other objects-				Path p = ((PathObject) path).get_path ();-				SvgParser.apply_matrix (p, 1, 0, s, 1, 0, 0);-				p.skew = skew;-				path.update_region_boundaries ();-			}+		foreach (Path path in glyph.active_paths) {+			SvgParser.apply_matrix (path, 1, 0, s, 1, 0, 0);+			path.skew = skew;+			path.update_region_boundaries (); 		} 		 		glyph.selection_boundaries (out nx, out y, out nw, out h); 		 		dx = -(nx - x); 		-		foreach (SvgBird.Object p in glyph.active_paths) {+		foreach (Path p in glyph.active_paths) { 			p.move (dx, 0);+			p.reset_stroke (); 		} 		 		dw = (nw - w);diff --git a/libbirdfont/SaveCallback.vala b/libbirdfont/SaveCallback.valaindex a183834..ae45fea 100644--- a/libbirdfont/SaveCallback.vala+++ b/libbirdfont/SaveCallback.vala@@ -28,7 +28,7 @@ public class SaveCallback : GLib.Object { 	} 	 	public void save_as ()  {-		if (unlikely (MenuTab.has_suppress_event ())) {+		if (MenuTab.has_suppress_event ()) { 			warn_if_test ("Event suppressed"); 			return; 		}@@ -54,7 +54,6 @@ public class SaveCallback : GLib.Object { 				file_name = @"$(f)"; 				file = File.new_for_path (file_name); 				font_file_path = (!) file.get_path ();-				 				if (!file.query_exists ()) { 					save (); 				} else {diff --git a/libbirdfont/Scrollbar.vala b/libbirdfont/Scrollbar.valanew file mode 100644index 0000000..afcb34f--- /dev/null+++ b/libbirdfont/Scrollbar.vala@@ -0,0 +1,155 @@+/*
+	Copyright (C) 2016 Johan Mattsson
+
+	This library is free software; you can redistribute it and/or modify 
+	it under the terms of the GNU Lesser General Public License as 
+	published by the Free Software Foundation; either version 3 of the 
+	License, or (at your option) any later version.
+
+	This library is distributed in the hope that it will be useful, but 
+	WITHOUT ANY WARRANTY; without even the implied warranty of 
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+	Lesser General Public License for more details.
+*/
++using Cairo;+
+namespace BirdFont {
+
+public class Scrollbar : GLib.Object {++	public double position = 1;+	public double size = 1;+	public double width = 0;+	public double left_x = 0;+	public double height = 0;+	public double corner = 0;+	public double scroll_max = 1;+	public double margin = 0;++	public double motion_x = 0;+	public double motion_y = 0;+	public bool move = false;++	public Scrollbar () {	+	}++	public bool button_press (uint button, double x, double y) {+		if (!is_visible ()) {+			return false;+		}+		+		double h = height * position * scroll_max;+	+		if (left_x < x < left_x + width &&+			 h - corner < y < h + height * size + corner + 2 * margin) {+			 	+			motion_x = x;+			motion_y = y;+			+			move = true;+		}+		+		return left_x < x < left_x + width && 0 < size < 1;+	}++	public bool button_release (uint button, double x, double y) {+		if (!is_visible ()) {+			return false;+		}+		+		if (move) {+			move = false;+			return true;+		} else if (left_x < x < left_x + width) {+			double h = height * position * scroll_max;+			+			if (y > h + size * height) {+				position += size;+			} +			+			if (y < h) {+				position -= size;+			}+			+			if (position > 1) {+				position = 1;+			} else if (position < 0) {+				position = 0;			+			}+			+			TabContent.scroll_to (position);+			GlyphCanvas.redraw ();+			return true;+		}+		+		return false;+	}+	++	public bool motion (double x, double y) {+		if (!move || !is_visible ()) {+			return false;	+		}++		double p = (y - motion_y) / (height - size * height);+		position += p;++		if (position > 1) {+			position = 1;+		} else if (position < 0) {+			position = 0;			+		}++		TabContent.scroll_to (position);		++		GlyphCanvas.redraw ();+		+		motion_y = y;+		motion_x = x;++		return false;+	}+	+	public void draw (Context cr, WidgetAllocation content_allocation, double width) {+		if (!is_visible ()) {+			return;+		}		+		+		cr.save ();++		this.width = width;		+		this.left_x = content_allocation.width;+		this.height = content_allocation.height;+		this.corner = 4 * Screen.get_scale ();+		this.scroll_max = 1 - size - 2 * corner / height;+		this.margin = 2 * Screen.get_scale ();+				+		Theme.color (cr, "Table Background 1");	+		cr.rectangle (left_x, 0, width, height);		+		cr.fill ();		++		Theme.color (cr, "Tool Foreground");+		double h = height * position * scroll_max;+		+		Widget.draw_rounded_rectangle (cr, left_x + margin, h, width - 2 * margin, height * size + 2 * margin, corner);			+		cr.fill ();+		+		cr.restore ();+	}+	+	public bool is_visible () {+		return 0 < size < 1;+	}++	public void set_size (double size) {+		this.size = size; +	}++	public void set_position (double position) {+		this.position = position;+	}+}++}+ \ No newline at end of filediff --git a/libbirdfont/SearchPaths.vala b/libbirdfont/SearchPaths.valaindex 338f2d5..2238685 100644--- a/libbirdfont/SearchPaths.vala+++ b/libbirdfont/SearchPaths.vala@@ -94,7 +94,7 @@ public class SearchPaths { 		f = get_file (@"/usr/share/birdfont/" + d + "/", name); 		if (likely (f.query_exists ())) return f; -		return f;+		return f;		 	} 		 	public static string get_locale_directory () {diff --git a/libbirdfont/SettingsTab.vala b/libbirdfont/SettingsTab.valaindex 3a866da..7702f0a 100644--- a/libbirdfont/SettingsTab.vala+++ b/libbirdfont/SettingsTab.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2014 2015 Johan Mattsson+	Copyright (C) 2014 2015 2016 Johan Mattsson  	This library is free software; you can redistribute it and/or modify  	it under the terms of the GNU Lesser General Public License as @@ -18,6 +18,8 @@ using Math; namespace BirdFont {  public class SettingsTab : SettingsDisplay {++	string restart_message = "You need to restart the program in order to apply this setting.";	 	 	public SettingsTab () { 		base ();@@ -43,13 +45,13 @@ public class SettingsTab : SettingsDisplay {  		stroke_width.new_value_action.connect ((self) => { 			Glyph g = MainWindow.get_current_glyph ();-			CanvasSettings.stroke_width = stroke_width.get_value ();+			Path.stroke_width = stroke_width.get_value (); 			g.redraw_area (0, 0, g.allocation.width, g.allocation.height); 			Preferences.set ("stroke_width_for_open_paths", stroke_width.get_display_value ()); 			MainWindow.get_toolbox ().redraw ((int) stroke_width.x, (int) stroke_width.y, 70, 70); 		}); 		-		CanvasSettings.stroke_width = stroke_width.get_value ();+		Path.stroke_width = stroke_width.get_value (); 		 		// adjust precision 		string precision_value = Preferences.get ("precision");@@ -81,7 +83,7 @@ public class SettingsTab : SettingsDisplay {  		Tool show_all_line_handles = new Tool ("show_all_line_handles"); 		show_all_line_handles.select_action.connect((self) => {-			CanvasSettings.show_all_line_handles = !CanvasSettings.show_all_line_handles;+			Path.show_all_line_handles = !Path.show_all_line_handles; 			Glyph g = MainWindow.get_current_glyph (); 			g.redraw_area (0, 0, g.allocation.width, g.allocation.height);			 		});@@ -89,11 +91,11 @@ public class SettingsTab : SettingsDisplay {  		Tool fill_open_path = new Tool ("fill_open_path"); 		fill_open_path.select_action.connect((self) => {-			CanvasSettings.fill_open_path = true;	+			Path.fill_open_path = true;	 		}); 		 		fill_open_path.deselect_action.connect((self) => {-			CanvasSettings.fill_open_path = false;	+			Path.fill_open_path = false;	 		}); 		tools.add (new SettingsItem (fill_open_path, t_("Fill open paths."))); @@ -141,6 +143,25 @@ public class SettingsTab : SettingsDisplay { 			DrawingTools.pen_tool.set_simplification_threshold (simplification_threshold.get_value ()); 		}); +		Tool translate_ui = new Tool ("translate");+		translate_ui.select_action.connect((self) => {+			Preferences.set ("translate", @"true");	+			ThemeTab.redraw_ui ();+			translate_ui.selected = true;+			MainWindow.show_dialog (new MessageDialog (restart_message));+		});+		+		translate_ui.deselect_action.connect((self) => {+			Preferences.set ("translate", @"false");+			translate_ui.selected = false;+			MainWindow.show_dialog (new MessageDialog (restart_message));+			ThemeTab.redraw_ui ();+		});++		string translate_setting = Preferences.get ("translate");+		translate_ui.selected = translate_setting == "" || translate_setting == "true";		+		tools.add (new SettingsItem (translate_ui, t_("Translate")));+		 		Tool themes = new Tool ("open_theme_tab"); 		themes.set_icon ("theme"); 		themes.select_action.connect((self) => {diff --git a/libbirdfont/SpacingClass.vala b/libbirdfont/SpacingClass.valaindex 43009df..697c182 100644--- a/libbirdfont/SpacingClass.vala+++ b/libbirdfont/SpacingClass.vala@@ -41,6 +41,11 @@ public class SpacingClass : GLib.Object  { 		update (next); 	} 	+	public void update_class (string value, bool first) {+		update_first = first;+		update (value);+	}+	 	void update (string val) { 		listener = new TextListener (t_("Character"), val, t_("Set")); 		@@ -48,7 +53,7 @@ public class SpacingClass : GLib.Object  { 			string v = text; 			 			if (v.has_prefix ("U+") || v.has_prefix ("u+")) {-				v = (!) Font.to_unichar (val).to_string ();+				v = ((!) Font.to_unichar (v).to_string ()).dup (); 			} 			 			if (update_first) {@@ -56,12 +61,11 @@ public class SpacingClass : GLib.Object  { 			} else { 				next = v.dup (); 			}-			-			updated (this); 		}); 		 		listener.signal_submit.connect (() => { 			TabContent.hide_text_input ();+			updated (this); 		}); 		 		TabContent.show_text_input (listener);diff --git a/libbirdfont/SpacingClassTab.vala b/libbirdfont/SpacingClassTab.valaindex 910b969..8331c3f 100644--- a/libbirdfont/SpacingClassTab.vala+++ b/libbirdfont/SpacingClassTab.vala@@ -20,13 +20,26 @@ public class SpacingClassTab : Table { 	 	public static int NEW_CLASS = -1; 	Gee.ArrayList<Row> rows = new Gee.ArrayList<Row> ();+	public static SpacingClass current_class;+	public static bool current_class_first_element; 	 	public SpacingClassTab () {+		current_class = new SpacingClass ("", ""); 	}  	public override Gee.ArrayList<Row> get_rows () { 		return rows; 	}+	+	public static void set_class (string glyph) {+		if (current_class_first_element) {+			current_class.first = glyph;+		} else {+			current_class.next = glyph;+		}+		+		MainWindow.get_spacing_class_tab ().update_rows ();+	}  	public override void selected_row (Row row, int column, bool delete_button) { 		Font font = BirdFont.get_current_font ();@@ -51,11 +64,15 @@ public class SpacingClassTab : Table { 					warning (@"Index: $(row.get_index ()) classes.size: $(spacing.classes.size)"); 					return; 				}-				spacing.classes.get (row.get_index ()).set_first ();+				current_class = spacing.classes.get (row.get_index ());+				current_class.set_first ();+				current_class_first_element = true; 				font.touch (); 			} else if (column == 2) { 				return_if_fail (0 <= row.get_index () < spacing.classes.size);-				spacing.classes.get (row.get_index ()).set_next ();+				current_class = spacing.classes.get (row.get_index ());+				current_class.set_next ();+				current_class_first_element = false; 				font.touch (); 			} 		}diff --git a/libbirdfont/SpacingClassTools.vala b/libbirdfont/SpacingClassTools.valanew file mode 100644index 0000000..fc41fda--- /dev/null+++ b/libbirdfont/SpacingClassTools.vala@@ -0,0 +1,66 @@+/*+	Copyright (C) 2016 Johan Mattsson++	This library is free software; you can redistribute it and/or modify +	it under the terms of the GNU Lesser General Public License as +	published by the Free Software Foundation; either version 3 of the +	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but +	WITHOUT ANY WARRANTY; without even the implied warranty of +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +	Lesser General Public License for more details.+*/++using Cairo;+using Math;++namespace BirdFont {++public class SpacingClassTools : ToolCollection  {+	public static Gee.ArrayList<Expander> expanders;++	public SpacingClassTools () {+		expanders = new Gee.ArrayList<Expander> ();++		Expander font_name = new Expander ();+		font_name.add_tool (new FontName ());+		+		Expander spacing_class_tools = new Expander ();+		Tool insert = new Tool ("insert_glyph_from_overview_in_spacing_class", t_("Insert glyph from overview"));+		+		insert.set_icon ("insert_glyph_from_overview");+		+		insert.select_action.connect ((self) => {+			GlyphSelection glyph_selection = new GlyphSelection ();+			+			glyph_selection.selected_glyph.connect ((glyph_collection) => {+				SpacingClassTab.set_class (glyph_collection.get_name ());+				MainWindow.get_tab_bar ().select_tab_name ("SpacingClasses");+			});+			+			GlyphCanvas.set_display (glyph_selection);+			self.set_selected (false);+			+			TabContent.hide_text_input ();+		});+		spacing_class_tools.add_tool (insert);+		+		expanders.add (font_name);+		+		expanders.add (spacing_class_tools);+	}+	+	public override Gee.ArrayList<Expander> get_expanders () {+		return expanders;+	}+	+	public override Gee.ArrayList<string> get_displays () {+		Gee.ArrayList<string> d = new Gee.ArrayList<string> ();+		d.add ("SpacingClasses");+		return d;+	}+		+}++}diff --git a/libbirdfont/SpacingData.vala b/libbirdfont/SpacingData.valaindex 50fd36d..39cff23 100644--- a/libbirdfont/SpacingData.vala+++ b/libbirdfont/SpacingData.vala@@ -69,7 +69,7 @@ public class SpacingData : GLib.Object { 					add_connections (s.next); 				} 			}-+			 			if (s.next == glyph) { 				if (!has_connection (s.first)) { 					add_connections (s.first);@@ -83,11 +83,11 @@ public class SpacingData : GLib.Object { 	}  	public void add_class (string first, string next) {-		SpacingClass s = new SpacingClass (first, next);-		s.updated.connect (update_all_rows);-		s.updated.connect (update_kerning);-		classes.add (s);-		update_kerning (s);+		SpacingClass spacing_class = new SpacingClass (first, next);+		spacing_class.updated.connect (update_all_rows);+		spacing_class.updated.connect (update_kerning);+		classes.add (spacing_class);+		update_kerning (spacing_class); 	}  	void update_all_rows (SpacingClass s) {@@ -103,14 +103,18 @@ public class SpacingData : GLib.Object { 			return; 		} -		kerning_classes.update_space_class (s.next);+		if (s.next == "" || s.first == "") {+			return;+		}+		+		kerning_classes.copy_single_kerning_pairs (s.first, s.next);+		 		g = font.get_glyph_collection (s.next); 		if (g != null) { 			gc = (!) g; 			gc.get_current ().update_spacing_class (); 		} -		kerning_classes.update_space_class (s.first); 		g = font.get_glyph_collection (s.first); 		if (g != null) { 			gc = (!) g;diff --git a/libbirdfont/SpacingTab.vala b/libbirdfont/SpacingTab.valaindex 949d017..2613d5d 100644--- a/libbirdfont/SpacingTab.vala+++ b/libbirdfont/SpacingTab.vala@@ -250,6 +250,7 @@ public class SpacingTab : KerningDisplay { 			 			v = double.parse (submitted_value); 			text_input_glyph.left_limit -= v - text_input_glyph.get_left_side_bearing ();+			text_input_glyph.update_other_spacing_classes (); 		}); 		 		suppress_input = true;@@ -294,6 +295,7 @@ public class SpacingTab : KerningDisplay { 			 			v = double.parse (submitted_value); 			text_input_glyph.right_limit += v - text_input_glyph.get_right_side_bearing ();+			text_input_glyph.update_other_spacing_classes (); 		}); 		 		suppress_input = true;diff --git a/libbirdfont/SpinButton.vala b/libbirdfont/SpinButton.valaindex 374f617..2a3864b 100644--- a/libbirdfont/SpinButton.vala+++ b/libbirdfont/SpinButton.vala@@ -44,12 +44,6 @@ public class SpinButton : Tool { 	 	/** Lock the button to a fixed value. */ 	public bool locked = false;--	static Gee.ArrayList<Text> digits;-	static double text_height = 14;-	static Text period;-	static Text comma;-	static Text minus; 	 	public SpinButton (string? name = null, string tip = "") { 		base (null , tip);@@ -57,7 +51,7 @@ public class SpinButton : Tool { 		if (name != null) { 			base.name = (!) name; 		}-+	 		set_icon ("spin_button"); 	 		panel_press_action.connect ((selected, button, tx, ty) => {@@ -150,23 +144,6 @@ public class SpinButton : Tool { 			decrease (); 			return true; 		});--		if (is_null (digits)) {-			add_digits ();-		}-	}-	-	void add_digits () {-		digits = new Gee.ArrayList<Text> ();-		-		for (int i = 0; i < 10; i++) {-			Text digit = new Text (@"$i", text_height);-			digits.add (digit);-		}-		-		period = new Text (".", text_height);-		comma = new Text (",", text_height);-		minus = new Text ("-", text_height); 	} 	 	public void show_icon (bool i) {@@ -476,29 +453,16 @@ public class SpinButton : Tool { 		return v; 	} 	-	Text get_glyph (unichar character) {-		Text text;-		-		if ('0' <= character <= '9') {-			int digit_index = int.parse ((!) character.to_string ());-			text = digits.get (digit_index);-		} else if (character == '.') {-			text = period;-		} else if (character == ',') {-			text = comma;-		} else if (character == '-') {-			text = minus;-		} else {-			text = new Text ((!) character.to_string (), text_height);-		}-		-		return text;-	}-	 	public override void draw_tool (Context cr, double px, double py) {+		double scale = Toolbox.get_scale ();+		double text_height = 14 * scale;+		string display_value = get_short_display_value ();+		Text text = new Text (display_value, text_height); 		double x = x - px; 		double y = y - py;-		string display_value = get_short_display_value ();+		+		double text_x = x + (w - text.get_sidebearing_extent ()) / 2 + 1;+		double text_y = y + (h - text_height) / 2;  		if (!show_icon_tool_icon || waiting_for_icon_switch) { 			if (is_selected ()) {@@ -517,48 +481,15 @@ public class SpinButton : Tool { 		base.draw_tool (cr, px, py); 	 		if (!show_icon_tool_icon || waiting_for_icon_switch) {-			unichar digit;-			int index;-			Text text;-			double extent = 0;-			double decender = 0;-			double carret = 0;-			double total_extent = 0;-			double x_offset;-			-			index = 0;-			while (display_value.get_next_char (ref index, out digit)) {-				text = get_glyph (digit);-				total_extent += text.get_sidebearing_extent ();+			if (is_selected ()) {+				Theme.text_color (text, "Selected Tool Foreground");+			} else {+				Theme.text_color (text, "Tool Foreground"); 			} 			-			x_offset = (w - total_extent) / 2 + 1;-			-			index = 0;-			while (display_value.get_next_char (ref index, out digit)) {-				text = get_glyph (digit);-				extent = text.get_sidebearing_extent ();-				-				if (decender < text.get_decender ()) {-					decender = text.get_decender ();-				}--				if (is_selected ()) {-					Theme.text_color (text, "Selected Tool Foreground");-				} else {-					Theme.text_color (text, "Tool Foreground");-				}--				double text_x = x + carret + x_offset;;-				double text_y = y + (h - text_height) / 2;--				text.widget_x = text_x;-				text.widget_y = text_y + decender;-				text.draw (cr);-				-				carret += extent;-				-			}			+			text.widget_x = text_x;+			text.widget_y = text_y + text.get_decender ();+			text.draw (cr); 		} 	} }diff --git a/libbirdfont/Stop.vala b/libbirdfont/Stop.valanew file mode 100644index 0000000..ad4aa4c--- /dev/null+++ b/libbirdfont/Stop.vala@@ -0,0 +1,35 @@+/*+	Copyright (C) 2015 Johan Mattsson++	This library is free software; you can redistribute it and/or modify +	it under the terms of the GNU Lesser General Public License as +	published by the Free Software Foundation; either version 3 of the +	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but +	WITHOUT ANY WARRANTY; without even the implied warranty of +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +	Lesser General Public License for more details.+*/++using Cairo;+using Math;++namespace BirdFont {++public class Stop : GLib.Object {+	public Color color = Color.black ();+	public double offset = 0;+	+	public Stop () {+	}+	+	public Stop copy () {+		Stop s = new Stop ();+		s.color = color.copy  ();+		s.offset = offset;+		return s;+	}+}++}diff --git a/libbirdfont/StrokeTool.vala b/libbirdfont/StrokeTool.valaindex a019db6..6476018 100644--- a/libbirdfont/StrokeTool.vala+++ b/libbirdfont/StrokeTool.vala@@ -14,10 +14,15 @@  using Cairo; using Math;-using SvgBird;  namespace BirdFont { +public enum LineCap {+	BUTT,+	SQUARE,+	ROUND+}+ public class StrokeTool : GLib.Object { 	 	public static double stroke_width = 0;@@ -26,7 +31,7 @@ public class StrokeTool : GLib.Object { 	public static bool show_stroke_tools = false; 	public static bool convert_stroke = false; 	-	public static SvgBird.LineCap line_cap = SvgBird.LineCap.BUTT;+	public static LineCap line_cap = LineCap.BUTT; 	 	StrokeTask task; @@ -46,27 +51,22 @@ public class StrokeTool : GLib.Object { 		convert_stroke = true;	 		g.store_undo_state (); 		-		foreach (SvgBird.Object o in g.active_paths) {-			if (o is PathObject) {-				PathObject path = (PathObject) o;-				Path p = path.get_path ();-				-				if (p.stroke > 0) {-					paths.append (p.get_completed_stroke ());-				}+		foreach (Path p in g.active_paths) {+			if (p.stroke > 0) {+				paths.append (p.get_completed_stroke ()); 			} 		}  		if (paths.paths.size > 0) {-			foreach (SvgBird.Object o in g.active_paths) {-				g.layers.remove (o);+			foreach (Path p in g.active_paths) {+				g.layers.remove_path (p); 			} 			 			g.active_paths.clear ();  			foreach (Path np in paths.paths) { 				g.add_path (np);-				g.active_paths.add (new PathObject.for_path (np));+				g.active_paths.add (np); 			} 			 			PenTool.update_orientation ();@@ -134,15 +134,11 @@ public class StrokeTool : GLib.Object { 		 		g.store_undo_state (); -		foreach (SvgBird.Object object in g.active_paths) {-			if (object is PathObject) {-				Path p = ((PathObject) object).get_path ();-				-				if (p.stroke == 0) {-					o.add (p);-				} else {-					o.append (p.get_completed_stroke ());-				}+		foreach (Path p in g.active_paths) {+			if (p.stroke == 0) {+				o.add (p);+			} else {+				o.append (p.get_completed_stroke ()); 			} 		} 						@@ -221,8 +217,8 @@ public class StrokeTool : GLib.Object { 			return; 		} 				-		foreach (SvgBird.Object object in g.active_paths) {-			g.layers.remove (object);+		foreach (Path p in g.active_paths) {+			g.delete_path (p); 		} 		 		g.clear_active_paths ();@@ -230,9 +226,8 @@ public class StrokeTool : GLib.Object { 		remove_merged_curve_parts (new_paths); 	 		foreach (Path p in new_paths.paths) {-			PathObject path = new PathObject.for_path (p);-			g.add_object (path);-			g.add_active_object (null, path);+			g.add_path (p);+			g.add_active_path (null, p); 		} 		 		PenTool.update_orientation ();@@ -1076,7 +1071,7 @@ public class StrokeTool : GLib.Object { 		return simplified; 	} 	-	Path fit_bezier_path (Path p, int start, int stop, double error) {+	public static Path fit_bezier_path (Path p, int start, int stop, double error) { 		int index, size; 		Path simplified; 		double[] lines;@@ -1146,9 +1141,9 @@ public class StrokeTool : GLib.Object { 	}  	void add_line_cap (Path path, Path stroke1, Path stroke2, bool last_cap) {-		if (path.line_cap == SvgBird.LineCap.SQUARE) {+		if (path.line_cap == LineCap.SQUARE) { 			add_square_cap (path, stroke1, stroke2, last_cap);-		} else if (path.line_cap == SvgBird.LineCap.ROUND) {+		} else if (path.line_cap == LineCap.ROUND) { 			add_round_cap (path, stroke1, stroke2, last_cap); 		} 	}diff --git a/libbirdfont/Svg.vala b/libbirdfont/Svg.valaindex 82eaf9a..c06a137 100644--- a/libbirdfont/Svg.vala+++ b/libbirdfont/Svg.vala@@ -16,8 +16,6 @@ using Cairo;  namespace BirdFont { -// FIXME: substrings- public class Svg {  	/** Export to svg glyph data. */@@ -106,13 +104,14 @@ public class Svg { 	private static void add_abs_start (EditPoint ep, StringBuilder svg, Glyph g, bool to_glyph) {		 		double left = g.left_limit; 		double baseline = -BirdFont.get_current_font ().base_line;-		double height = g.get_height ();+		Font font = BirdFont.get_current_font ();+		double height = font.top_limit - font.base_line;  		 		svg.append_printf ("M"); 		 		if (!to_glyph) { 			svg.append_printf ("%s ",  round (ep.x - left));-			svg.append_printf ("%s ",  round (-ep.y + height / 2));+			svg.append_printf ("%s ",  round (-ep.y + height)); 		} else { 			svg.append_printf ("%s ",  round (ep.x - left)); 			svg.append_printf ("%s ",  round (ep.y + baseline));@@ -126,7 +125,9 @@ public class Svg { 	private static void add_abs_line_to (EditPoint start, EditPoint stop, StringBuilder svg, Glyph g, bool to_glyph) { 		double baseline = -BirdFont.get_current_font ().base_line; 		double left = g.left_limit;-		double height = g.get_height ();+		Font font = BirdFont.get_current_font ();+		double height = font.top_limit - font.base_line; + 		 		double xa, ya, xb, yb; 		@@ -139,7 +140,7 @@ public class Svg { 	 		if (!to_glyph) { 			svg.append_printf ("%s ", round (xb - center_x - left));-			svg.append_printf ("%s ", round (yb - center_y + height / 2));	+			svg.append_printf ("%s ", round (yb - center_y + height));	 		} else { 			svg.append_printf ("%s ", round (xb - center_x - left)); 			svg.append_printf ("%s ", round (-yb + center_y + baseline));@@ -163,7 +164,8 @@ public class Svg { 	private static void add_quadratic_abs_path (EditPoint start, EditPoint end, StringBuilder svg, Glyph g,  bool to_glyph) { 		double left = g.left_limit; 		double baseline = -BirdFont.get_current_font ().base_line;-		double height = g.get_height ();+		Font font = BirdFont.get_current_font ();+		double height = font.top_limit - font.base_line; 		 		double xa, ya, xb, yb, xc, yc, xd, yd; 		@@ -177,10 +179,10 @@ public class Svg { 			svg.append_printf ("Q");  			svg.append_printf ("%s ", round (xb - center_x - left));-			svg.append_printf ("%s ", round (yb - center_y + height / 2));+			svg.append_printf ("%s ", round (yb - center_y + height)); 			 			svg.append_printf ("%s ", round (xd - center_x - left));-			svg.append_printf ("%s ", round (yd - center_y + height / 2));+			svg.append_printf ("%s ", round (yd - center_y + height));  		} else {		 			svg.append_printf ("Q");@@ -196,7 +198,8 @@ public class Svg { 	private static void add_cubic_abs_path (EditPoint start, EditPoint end, StringBuilder svg, Glyph g,  bool to_glyph) { 		double left = g.left_limit; 		double baseline = -BirdFont.get_current_font ().base_line;-		double height = g.get_height ();+		Font font = BirdFont.get_current_font ();+		double height = font.top_limit - font.base_line; 		 		double xa, ya, xb, yb, xc, yc, xd, yd; 		@@ -210,13 +213,13 @@ public class Svg { 			svg.append_printf ("C");  			svg.append_printf ("%s ", round (xb - center_x - left));-			svg.append_printf ("%s ", round (yb - center_y + height / 2));+			svg.append_printf ("%s ", round (yb - center_y + height)); 			 			svg.append_printf ("%s ", round (xc - center_x - left));-			svg.append_printf ("%s ", round (yc - center_y + height / 2));+			svg.append_printf ("%s ", round (yc - center_y + height)); 			 			svg.append_printf ("%s ", round (xd - center_x - left));-			svg.append_printf ("%s ", round (yd - center_y + height / 2));	+			svg.append_printf ("%s ", round (yd - center_y + height));	  		} else {		 			svg.append_printf ("C");diff --git a/libbirdfont/SvgArc.vala b/libbirdfont/SvgArc.valanew file mode 100644index 0000000..92f3689--- /dev/null+++ b/libbirdfont/SvgArc.vala@@ -0,0 +1,181 @@+/*+ * BirdFont code from SVG Salamander+ * + * Copyright (c) 2004, Mark McKay+ * Copyright (c) 2014, Johan Mattsson+ * All rights reserved.+ *+ * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following+ * conditions are met:+ *+ *   - Redistributions of source code must retain the above + *     copyright notice, this list of conditions and the following+ *     disclaimer.+ *   - Redistributions in binary form must reproduce the above+ *     copyright notice, this list of conditions and the following+ *     disclaimer in the documentation and/or other materials + *     provided with the distribution.+ *+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED+ * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Mark McKay can be contacted at mark@kitfox.com.  Salamander and other+ * projects can be found at http://www.kitfox.com+ *+ * Created on January 26, 2004, 8:40 PM+ * Adapded to BirdFont on Juli 2, 2014, 5:01 PM+ */++using Math;++namespace BirdFont {++/** Convert an SVG arc instruction to a Beziér path. */+static void add_arc_points (BezierPoints[] bezier_points, ref int bi, double x0, double y0, double rx, double ry, double angle, bool largeArcFlag, bool sweepFlag, double x, double y) {++	//+	// Elliptical arc implementation based on the SVG specification notes+	//++	double dx2, dy2, cosAngle, sinAngle;+	double x1, y1, Prx, Pry, Px1, Py1, radiiCheck;+	double sign, sq, coef, cx1, cy1;+	double sx2, sy2, cx, cy;+	double ux, uy, vx, vy, p, n;+	double angleStart, angleExtent;+	double s, step, theta;+	+	// Compute the half distance between the current and the final point+	dx2 = (x0 - x) / 2.0;+	dy2 = (y0 - y) / 2.0;+	+	// Convert angle from degrees to radians+	angle = 2 * PI * ((angle % 360.0) / 360.0);+	+	cosAngle = cos (angle);+	sinAngle = sin (angle);++	//+	// Step 1 : Compute (x1, y1)+	//+	x1 = cosAngle * dx2 + sinAngle * dy2;+	y1 = -sinAngle * dx2 + cosAngle * dy2;+	+	// Ensure radii are large enough+	rx = fabs(rx);+	ry = fabs(ry);+	Prx = rx * rx;+	Pry = ry * ry;+	Px1 = x1 * x1;+	Py1 = y1 * y1;++	+	// Check that radii are large enough+	radiiCheck = Px1 / Prx + Py1 / Pry;+	+	if (radiiCheck > 1) {+		rx = sqrt (radiiCheck) * rx;+		ry = sqrt (radiiCheck) * ry;+		Prx = rx * rx;+		Pry = ry * ry;+	}++	//+	// Step 2 : Compute (cx1, cy1)+	//+	sign = (largeArcFlag == sweepFlag) ? -1 : 1;+	sq = ((Prx * Pry) - (Prx * Py1) - (Pry * Px1)) / ((Prx * Py1) + (Pry * Px1));+	sq = (sq < 0) ? 0 : sq;+	coef = (sign * Math.sqrt(sq));+	cx1 = coef * ((rx * y1) / ry);+	cy1 = coef * -((ry * x1) / rx);++	//+	// Step 3 : Compute (cx, cy) from (cx1, cy1)+	//+	+	sx2 = (x0 + x) / 2.0;+	sy2 = (y0 + y) / 2.0;+	cx = sx2 - (cosAngle * cx1 - sinAngle * cy1);+	cy = sy2 - (sinAngle * cx1 + cosAngle * cy1);++	//+	// Step 4 : Compute the angleStart (angle1) and the angleExtent (dangle)+	//+	+	ux = (x1 - cx1) / rx;+	uy = (y1 - cy1) / ry;+	vx = (-x1 - cx1) / rx;+	vy = (-y1 - cy1) / ry;++	// Compute the angle start+	n = sqrt((ux * ux) + (uy * uy));+	p = ux; // (1 * ux) + (0 * uy)+	sign = (uy < 0) ? -1d : 1d;+	angleStart = sign * acos(p / n);++	// Compute the angle extent+	n = Math.sqrt((ux * ux + uy * uy) * (vx * vx + vy * vy));+	p = ux * vx + uy * vy;+	sign = (ux * vy - uy * vx < 0) ? -1d : 1d;+	angleExtent = sign * Math.acos(p / n);+	+	if(!sweepFlag && angleExtent > 0) {+		angleExtent -= 2 *PI;+	} else if (sweepFlag && angleExtent < 0) {+		angleExtent += 2 *PI;+	}+	angleExtent %= 2 * PI;+	angleStart %= 2 * PI;++	angleExtent *= -1;+	angleStart *= -1;+	+	// Approximate the path with Beziér points+	s = (angleExtent > 0) ? 1 : -1;+	step = fabs (angleExtent) / (2 * fabs (angleExtent));++	theta = PI - angleStart - angleExtent;+	+	bezier_points[bi].type = 'L';+	bezier_points[bi].svg_type = 'a';++	bezier_points[bi].x0 = cx + rx * cos (theta);+	bezier_points[bi].y0 = cy + ry * sin (theta);+									+	bi++;+					+	for (double a = 0; a < fabs (angleExtent); a += step) {+		theta = PI - angleStart - angleExtent + s * a;++		return_if_fail (0 <= bi < bezier_points.length);++		bezier_points[bi].type = 'S';+		bezier_points[bi].svg_type = 'a';++		bezier_points[bi].x0 = cx + rx * cos (theta);+		bezier_points[bi].y0 = cy + ry * sin (theta);++		bezier_points[bi].x1 = cx + rx * cos (theta + 1 * step / 4);+		bezier_points[bi].y1 = cy + ry * sin (theta + 1 * step / 4);+		+		bezier_points[bi].x2 = cx + rx * cos (theta + 2 * step / 4);+		bezier_points[bi].y2 = cy + ry * sin (theta + 2 * step / 4);+						+		bi++;+	}+}++}+	diff --git a/libbirdfont/SvgFont.vala b/libbirdfont/SvgFont.valaindex 7223c2f..d959b5d 100644--- a/libbirdfont/SvgFont.vala+++ b/libbirdfont/SvgFont.vala@@ -253,6 +253,11 @@ class SvgFont : GLib.Object { 		glyph.right_limit = glyph.left_limit + advance * units; 		 		// FIXME: add svg font ligatures+		/*+		if (ligature != "") {+			glyph.set_ligature_substitution (ligature);+		}+		*/ 		 		glyph_collection = new GlyphCollection (unicode_value, glyph_name); 		glyph_collection.insert_glyph (glyph, true);diff --git a/libbirdfont/SvgFontFormatWriter.vala b/libbirdfont/SvgFontFormatWriter.valaindex b2e907b..4ade2ae 100644--- a/libbirdfont/SvgFontFormatWriter.vala+++ b/libbirdfont/SvgFontFormatWriter.vala@@ -14,7 +14,7 @@  namespace BirdFont { -class SvgFontFormatWriter : GLib.Object  {+class SvgFontFormatWriter : Object  {  	DataOutputStream os; @@ -56,10 +56,14 @@ class SvgFontFormatWriter : GLib.Object  { 		put ("""<svg>""");  		// (metadata goes here)--		put ("<defs>");--		put (@"<font id=\"$font_name\" horiz-adv-x=\"250\" >");+		+		string font_id = font_name.replace (" ", "-");+		font_id = B.XmlParser.encode (font_id); +		+		Glyph space = font.get_space ().get_current ();+		double space_width = space.get_width ();+		+		put (@"<font id=\"$font_id\" horiz-adv-x=\"$(to_float (space_width))\" >"); 		put (@"<font-face units-per-em=\"$(to_float (units_per_em))\" ascent=\"$(to_float (ascent))\" descent=\"$(to_float (descent))\" />");  		// (missing-glyph goes here)@@ -108,7 +112,6 @@ class SvgFontFormatWriter : GLib.Object  { 		});	  		put ("</font>");-		put ("</defs>"); 		put ("</svg>"); 	} diff --git a/libbirdfont/SvgParser.vala b/libbirdfont/SvgParser.valaindex cc07cdc..c298846 100644--- a/libbirdfont/SvgParser.vala+++ b/libbirdfont/SvgParser.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2012 2013 2014 2015 Johan Mattsson+	Copyright (C) 2012 - 2016 Johan Mattsson  	This library is free software; you can redistribute it and/or modify  	it under the terms of the GNU Lesser General Public License as @@ -14,7 +14,6 @@  using B; using Math;-using SvgBird;  namespace BirdFont { @@ -24,11 +23,6 @@ public enum SvgFormat { 	ILLUSTRATOR } -public enum SvgType {-	COLOR,-	REGULAR-}- public class SvgParser { 	 	SvgFormat format = SvgFormat.ILLUSTRATOR;@@ -40,7 +34,7 @@ public class SvgParser { 		format = f; 	} 	-	public static void import (SvgType type) {+	public static void import () { 		FileChooser fc = new FileChooser (); 		fc.file_selected.connect ((p) => { 			string path;@@ -50,32 +44,14 @@ public class SvgParser { 			} 			 			path = (!) p;-			-			if (type == SvgType.REGULAR) {-				import_svg (path);-			} else if (type == SvgType.COLOR) {-				Glyph glyph = MainWindow.get_current_glyph ();-				import_color_svg (glyph, path);-			}+			import_svg (path); 		}); 		 		fc.add_extension ("svg"); 		MainWindow.file_chooser (t_("Import"), fc, FileChooser.LOAD); 	}-		-	public static void import_color_svg (Glyph glyph, string path) {-		EmbeddedSvg drawing = SvgParser.parse_embedded_svg_file (path);-		-		Layer layer = new Layer ();-		layer.name = "SVG";-		layer.add_object (drawing);-		-		glyph.add_layer (layer);-		-		// FIXME: update GUI-	} 	-	public static void import_folder (SvgType type) {+	public static void import_folder () { 		FileChooser fc = new FileChooser (); 		fc.file_selected.connect ((p) => { 			string path;@@ -102,7 +78,7 @@ public class SvgParser { 					 					if (file_name.has_suffix (".svg")) { 						svg = get_child (svg_folder, file_name);-						imported = import_svg_file (font, svg, type);+						imported = import_svg_file (font, svg); 						 						if (!imported) { 							warning ("Can't import %s.", (!) svg.get_path ());@@ -125,6 +101,7 @@ public class SvgParser { 		string[] lines = xml_data.split ("\n"); 		bool has_format = false; 		SvgParser parser = new SvgParser ();+		XmlParser xmlparser;  		foreach (string l in lines) { 			if (l.index_of ("Illustrator") > -1 || l.index_of ("illustrator") > -1) {@@ -147,15 +124,22 @@ public class SvgParser { 			warn_if_test ("No format identifier found in SVG parser.\n"); 		} -		XmlTree xml_tree = new XmlTree (xml_data);-		path_list = parser.parse_svg_file (xml_tree.get_root ());+		xmlparser = new XmlParser (xml_data);+		+		if (!xmlparser.validate()) {+			warning("Invalid XML in SVG parser."); +		}+		+		path_list = parser.parse_svg_file (xmlparser.get_root_tag ()); 	 		glyph = MainWindow.get_current_glyph (); 		foreach (Path p in path_list.paths) {-			PathObject path = new PathObject.for_path (p);-			glyph.add_object (path);-			glyph.add_active_object (null, path); // FIXME: groups-			path.update_region_boundaries ();+			glyph.add_path (p);+		}+		+		foreach (Path p in path_list.paths) {+			glyph.add_active_path (null, p); // FIXME: groups+			p.update_region_boundaries (); 		} 		 		glyph.close_path ();	@@ -187,10 +171,10 @@ public class SvgParser { 		import_svg_data (svg_data); 	} 	-	private PathList parse_svg_file (XmlElement tag) {+	private PathList parse_svg_file (Tag tag) { 		Layer pl = new Layer (); 	-		foreach (XmlElement t in tag) {+		foreach (Tag t in tag) { 			 			if (t.get_name () == "g") { 				parse_layer (t, pl);@@ -225,10 +209,10 @@ public class SvgParser { 			}			 		} 		-		return LayerUtils.get_all_paths (pl);+		return pl.get_all_paths (); 	} 	-	private void parse_layer (XmlElement tag, Layer pl) {+	private void parse_layer (Tag tag, Layer pl) { 		Layer layer; 		bool hidden = false; @@ -248,7 +232,7 @@ public class SvgParser { 			return; 		} 					-		foreach (XmlElement t in tag) {+		foreach (Tag t in tag) { 			if (t.get_name () == "path") { 				parse_path (t, pl); 			}@@ -256,7 +240,7 @@ public class SvgParser { 			if (t.get_name () == "g") { 				layer = new Layer (); 				parse_layer (t, layer);-				pl.objects.add (layer);+				pl.subgroups.add (layer); 			} 			 			if (t.get_name () == "polygon") {@@ -292,20 +276,12 @@ public class SvgParser { 	} 	 	private void transform (string transform_functions, Layer layer) {-		PathList path_list = new PathList ();-		-		foreach (SvgBird.Object o in layer.objects) {-			if (o is PathObject) {-				path_list.add (((PathObject) o).get_path ());-			}-		}-		-		transform_paths (transform_functions, path_list);+		transform_paths (transform_functions, layer.paths); 		transform_subgroups (transform_functions, layer); 	} 	 	private void transform_subgroups (string transform_functions, Layer layer) {-		foreach (Layer subgroup in layer.get_sublayers ()) {+		foreach (Layer subgroup in layer.subgroups) { 			transform (transform_functions, subgroup); 		} 	}@@ -313,7 +289,7 @@ public class SvgParser { 	private void transform_paths (string transform_functions, PathList pl) { 		string data = transform_functions.dup (); 		string[] functions;-				+		 		// use only a single space as separator 		while (data.index_of ("  ") > -1) { 			data = data.replace ("  ", " ");@@ -360,8 +336,14 @@ public class SvgParser { 		 		foreach (EditPoint ep in path.points) { 			apply_matrix_on_handle (ep.get_right_handle (), a, b, c, d, e, f);-			apply_matrix_on_handle (ep.get_left_handle (), a, b, c, d, e, f);-+			+			EditPointHandle left = ep.get_left_handle ();+			if (left.type == PointType.QUADRATIC || left.type == PointType.LINE_QUADRATIC) {+				ep.get_right_handle ().process_connected_handle ();+			} else {				+				apply_matrix_on_handle (left, a, b, c, d, e, f);+			}+			 			ep.independent_y = font.top_position - ep.independent_y; 			ep.independent_x -= glyph.left_limit; 			@@ -470,13 +452,13 @@ public class SvgParser { 		param = param.replace (",", " "); 		 		while (param.index_of ("  ") > -1) {-			param.replace ("  ", " ");+			param = param.replace ("  ", " "); 		} 			 		return param.strip();			 	} 	-	private void parse_circle (XmlElement tag, Layer pl) {+	private void parse_circle (Tag tag, Layer pl) { 		Path p; 		double x, y, r; 		Glyph g;@@ -509,7 +491,7 @@ public class SvgParser { 			} 		} 		-		style = SvgStyle.parse (null, style, tag);+		style = SvgStyle.parse (tag.get_attributes ()); 		 		if (hidden) { 			return;@@ -535,11 +517,11 @@ public class SvgParser { 			} 		} 		-		npl.apply_style (style);-		append_paths (pl, npl);+		style.apply (npl);+		pl.paths.append (npl); 	} -	private void parse_ellipse (XmlElement tag, Layer pl) {+	private void parse_ellipse (Tag tag, Layer pl) { 		Path p; 		double x, y, rx, ry; 		Glyph g;@@ -577,7 +559,7 @@ public class SvgParser { 			} 		} 		-		style = SvgStyle.parse (null, style, tag);+		style = SvgStyle.parse (tag.get_attributes ()); 		 		if (hidden) { 			return;@@ -603,11 +585,11 @@ public class SvgParser { 			} 		} 		-		npl.apply_style (style);-		append_paths (pl, npl);+		style.apply (npl);+		pl.paths.append (npl); 	} -	private void parse_line (XmlElement tag, Layer pl) {+	private void parse_line (Tag tag, Layer pl) { 		Path p; 		double x1, y1, x2, y2; 		BezierPoints[] bezier_points;@@ -643,7 +625,7 @@ public class SvgParser { 			} 		} 		-		style = SvgStyle.parse (null, style, tag);+		style = SvgStyle.parse (tag.get_attributes ()); 		 		if (hidden) { 			return;@@ -661,7 +643,7 @@ public class SvgParser { 		bezier_points[1].y0 = y2; 		 		g = MainWindow.get_current_glyph ();-		move_and_resize (bezier_points, 4, false, 1, g);+		move_and_resize (bezier_points, 2, false, 1, g); 					 		p = new Path ();	 		@@ -680,11 +662,11 @@ public class SvgParser { 			} 		} 		-		npl.apply_style (style);-		append_paths (pl, npl);+		style.apply (npl);+		pl.paths.append (npl); 	} 		-	private void parse_rect (XmlElement tag, Layer layer) {+	private void parse_rect (Tag tag, Layer pl) { 		Path p; 		double x, y, x2, y2; 		BezierPoints[] bezier_points;@@ -721,7 +703,7 @@ public class SvgParser { 			} 		} 		-		style = SvgStyle.parse (null, style, tag);+		style = SvgStyle.parse (tag.get_attributes ()); 		 		if (hidden) { 			return;@@ -781,29 +763,26 @@ public class SvgParser { 			} 		} 		-		npl.apply_style (style);-		append_paths (layer, npl);+		style.apply (npl);+		pl.paths.append (npl); 	} 	-	private void parse_polygon (XmlElement tag, Layer layer) {+	private void parse_polygon (Tag tag, Layer pl) { 		PathList path_list = get_polyline (tag); 		 		foreach (Path p in path_list.paths) { 			p.close (); 		} 		-		append_paths (layer, path_list);+		pl.paths.append (path_list); 	} -	static void append_paths (Layer layer, PathList pl) {-		LayerUtils.append_paths (layer, pl);-	} 	-	private void parse_polyline (XmlElement tag, Layer layer) {	-		append_paths (layer, get_polyline (tag));+	private void parse_polyline (Tag tag, Layer pl) {	+		pl.paths.append (get_polyline (tag)); 	} 	-	private PathList get_polyline (XmlElement tag) {+	private PathList get_polyline (Tag tag) { 		Path p = new Path (); 		bool hidden = false; 		PathList path_list = new PathList ();@@ -819,14 +798,14 @@ public class SvgParser { 			} 		} -		style = SvgStyle.parse (null, style, tag);+		style = SvgStyle.parse (tag.get_attributes ()); 		 		if (hidden) { 			return path_list; 		} 		 		path_list.add (p);-		path_list.apply_style (style);+		style.apply (path_list); 		 		foreach (Attribute attr in tag.get_attributes ()) { 			if (attr.get_name () == "transform") {@@ -837,7 +816,7 @@ public class SvgParser { 		return path_list; 	} 	-	private void parse_path (XmlElement tag, Layer layer) {+	private void parse_path (Tag tag, Layer pl) { 		Glyph glyph = MainWindow.get_current_glyph (); 		PathList path_list = new PathList (); 		SvgStyle style = new SvgStyle ();@@ -859,52 +838,42 @@ public class SvgParser { 			} 		} 		-		style = SvgStyle.parse (null, style, tag);+		style = SvgStyle.parse (tag.get_attributes ()); 		 		if (hidden) { 			return; 		}-		-		foreach (Path path in path_list.paths) {-			LayerUtils.add_path (layer, path);-		}-		-		path_list.apply_style (style);+	+		pl.paths.append (path_list);+		style.apply (path_list);  		// assume the even odd rule is applied and convert the path 		// to a path using the non-zero rule 		int inside_count; 		bool inside;-		foreach (SvgBird.Object o1 in layer.objects) {-			if (o1 is PathObject) {-				Path p1 = ((PathObject) o1).get_path ();-				inside_count = 0;-				-				foreach (SvgBird.Object o2 in layer.objects) {-					if (o2 is PathObject) {-						Path p2 = ((PathObject) o2).get_path ();+		foreach (Path p1 in pl.paths.paths) {+			inside_count = 0;+			+			foreach (Path p2 in pl.paths.paths) {+				if (p1 != p2) {+					inside = true; 					-						if (p1 != p2) {-							inside = true;-							-							foreach (EditPoint ep in p1.points) {-								if (!is_inside (ep, p2)) {-									inside = false;-								}-							}--							if (inside) {-								inside_count++; -							}+					foreach (EditPoint ep in p1.points) {+						if (!is_inside (ep, p2)) {+							inside = false; 						} 					}++					if (inside) {+						inside_count++; +					} 				}-				-				if (inside_count % 2 == 0) {-					p1.force_direction (Direction.CLOCKWISE);-				} else {-					p1.force_direction (Direction.COUNTER_CLOCKWISE);-				}+			}++			if (inside_count % 2 == 0) {+				p1.force_direction (Direction.CLOCKWISE);+			} else {+				p1.force_direction (Direction.COUNTER_CLOCKWISE); 			} 		} 		@@ -1008,6 +977,49 @@ public class SvgParser { 		 		return inside; 	}++	/** Add space as separator to svg data. +	 * @param d svg data+	 */+	static string add_separators (string d) {+		string data = d;+		+		data = data.replace (",", " ");+		data = data.replace ("a", " a ");+		data = data.replace ("A", " A ");+		data = data.replace ("m", " m ");+		data = data.replace ("M", " M ");+		data = data.replace ("h", " h ");+		data = data.replace ("H", " H ");+		data = data.replace ("v", " v ");+		data = data.replace ("V", " V ");+		data = data.replace ("l", " l ");+		data = data.replace ("L", " L ");+		data = data.replace ("q", " q ");+		data = data.replace ("Q", " Q ");		+		data = data.replace ("c", " c ");+		data = data.replace ("C", " C ");+		data = data.replace ("t", " t ");+		data = data.replace ("T", " T ");+		data = data.replace ("s", " s ");+		data = data.replace ("S", " S ");+		data = data.replace ("zM", " z M ");+		data = data.replace ("zm", " z m ");+		data = data.replace ("z", " z ");+		data = data.replace ("Z", " Z ");+		data = data.replace ("-", " -");+		data = data.replace ("e -", "e-"); // minus can be either separator or a negative exponent+		data = data.replace ("\t", " ");+		data = data.replace ("\r\n", " ");+		data = data.replace ("\n", " ");+		+		// use only a single space as separator+		while (data.index_of ("  ") > -1) {+			data = data.replace ("  ", " ");+		}+		+		return data;+	} 	 	public void add_path_to_glyph (string d, Glyph g, bool svg_glyph = false, double units = 1) { 		PathList p = parse_svg_data (d, g, svg_glyph, units);@@ -1016,36 +1028,6 @@ public class SvgParser { 		} 	} 	-	public void get_bezier_points (string svg_data, out BezierPoints[] instructions, out int points, bool svg_glyph) {-		SvgFile.get_bezier_points (svg_data, out instructions, out points, svg_glyph);-		Gee.ArrayList<BezierPoints> bezier_points = new Gee.ArrayList<BezierPoints> ();-		BezierPoints[] arc_data = new BezierPoints[8];-		-		for (int i = 0; i < points; i++) {-			if (instructions[i].type == 'A') {-				int arc_index = 0;-				-				add_arc_points (arc_data, ref arc_index, -					instructions[i].x0, instructions[i].y0,-					instructions[i].rx, instructions[i].ry,-					instructions[i].angle,-					instructions[i].large_arc,-					instructions[i].sweep,-					instructions[i].x1, instructions[i].y1);-					-				for (int j = 0; j < arc_index; j++) {-					bezier_points.add (instructions[j]);-				}-			}-			-			bezier_points.add (instructions[i]);-		}-	-		instructions = new BezierPoints[bezier_points.size];-		for (int i = 0; i < bezier_points.size; i++) {-			instructions[i] = bezier_points.get (i);-		}-	} 	/**  	 * @param d svg data 	 * @param glyph use lines from this glyph but don't add the generated paths@@ -1054,25 +1036,556 @@ public class SvgParser { 	 * @return the new paths 	 */ 	public PathList parse_svg_data (string d, Glyph glyph, bool svg_glyph = false, double units = 1) {+		double px = 0;+		double py = 0;+		double px2 = 0;+		double py2 = 0;+		double cx = 0;+		double cy = 0;+		string data; 		Font font; 		PathList path_list = new PathList (); 		BezierPoints[] bezier_points;-		int points;+		string[] c;+		double arc_rx, arc_ry;+		double arc_rotation;+		int large_arc;+		int arc_sweep;+		double arc_dest_x, arc_dest_y;  		font = BirdFont.get_current_font ();-		SvgFile.get_bezier_points (d, out bezier_points, out points, svg_glyph);-	-		if (points == 0) {+		+		data = add_separators (d);+		c = data.split (" ");+		bezier_points = new BezierPoints[8 * c.length + 1]; // the arc instruction can use up to eight points+		+		for (int i = 0; i < 2 * c.length + 1; i++) {+			bezier_points[i] = new BezierPoints ();+		}+		+		int bi = 0;+		+		// parse path+		int i = -1;+		while (++i < c.length && bi < bezier_points.length) {	+			if (c[i] == "m") {+				while (i + 2 < c.length && is_point (c[i + 1])) {+					bezier_points[bi].type = 'M';+					bezier_points[bi].svg_type = 'm';+					+					px += parse_double (c[++i]);+					+					if (svg_glyph) {+						py += parse_double (c[++i]);+					} else {+						py += -parse_double (c[++i]);+					}+					+					bezier_points[bi].x0 = px;+					bezier_points[bi].y0 = py;+					bi++;+				}+			} else if (c[i] == "M") {+				while (i + 2 < c.length && is_point (c[i + 1])) {+					bezier_points[bi].type = 'M';+					bezier_points[bi].svg_type = 'M';+					+					px = parse_double (c[++i]);+					+					if (svg_glyph) {+						py = parse_double (c[++i]);+					} else {+						py = -parse_double (c[++i]);+					}+					+					bezier_points[bi].x0 = px;+					bezier_points[bi].y0 = py;+					bi++;+				}+			} else if (c[i] == "h") {+				while (i + 1 < c.length && is_point (c[i + 1])) {+					bezier_points[bi].type = 'L';+					bezier_points[bi].svg_type = 'h';+					+					px += parse_double (c[++i]);++					bezier_points[bi].x0 = px;+					bezier_points[bi].y0 = py;+					bi++;+				}+			} else if (i + 1 < c.length && c[i] == "H") {+				while (is_point (c[i + 1])) {+					bezier_points[bi].type = 'L';+					bezier_points[bi].svg_type = 'H';+					+					px = parse_double (c[++i]);++					bezier_points[bi].x0 = px;+					bezier_points[bi].y0 = py;+					bi++;+				}+			} else if (c[i] == "v") {+				while (i + 1 < c.length && is_point (c[i + 1])) {+					bezier_points[bi].type = 'L';+					bezier_points[bi].svg_type = 'v';+										+					if (svg_glyph) {+						py = py + parse_double (c[++i]);+					} else {+						py = py - parse_double (c[++i]);+					}+					+					bezier_points[bi].x0 = px;+					bezier_points[bi].y0 = py;+					bi++;+				}				+			} else if (i + 1 < c.length && c[i] == "V") {+				while (is_point (c[i + 1])) {+					bezier_points[bi].type = 'L';+					bezier_points[bi].svg_type = 'V';+										+					if (svg_glyph) {+						py = parse_double (c[++i]);+					} else {+						py = -parse_double (c[++i]);+					}+					+					bezier_points[bi].x0 = px;+					bezier_points[bi].y0 = py;+					bi++;+				}+			} else if (c[i] == "l") {+				while (i + 2 < c.length && is_point (c[i + 1])) {+					bezier_points[bi].type = 'L';+					bezier_points[bi].svg_type = 'l';+										+					cx = px + parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = py + parse_double (c[++i]);+					} else {+						cy = py - parse_double (c[++i]);+					}+					+					px = cx;+					py = cy;++					bezier_points[bi].x0 = cx;+					bezier_points[bi].y0 = cy;+					bi++;+				}+			} else if (c[i] == "L") {+				while (i + 2 < c.length && is_point (c[i + 1])) {+					bezier_points[bi].type = 'L';+					bezier_points[bi].svg_type = 'L';+										+					cx = parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = parse_double (c[++i]);+					} else {+						cy = -parse_double (c[++i]);+					}+					+					px = cx;+					py = cy;+					+					bezier_points[bi].x0 = cx;+					bezier_points[bi].y0 = cy;+					bi++;				+				}	+			} else if (c[i] == "c") {+				while (i + 6 < c.length && is_point (c[i + 1])) {+					bezier_points[bi].type = 'C';+					bezier_points[bi].svg_type = 'C';+										+					cx = px + parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = py + parse_double (c[++i]);+					} else {+						cy = py - parse_double (c[++i]);+					}+					+					bezier_points[bi].x0 = cx;+					bezier_points[bi].y0 = cy;+										+					cx = px + parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = py + parse_double (c[++i]);+					} else {+						cy = py - parse_double (c[++i]);+					}+					+					px2 = cx;+					py2 = cy;+										+					bezier_points[bi].x1 = px2;+					bezier_points[bi].y1 = py2;+										+					cx = px + parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = py + parse_double (c[++i]);+					} else {+						cy = py + -parse_double (c[++i]);+					}+					+					bezier_points[bi].x2 = cx;+					bezier_points[bi].y2 = cy;+										+					px = cx;+					py = cy;+					+					bi++;+				}+			} else if (c[i] == "C") {+				while (i + 6 < c.length && is_point (c[i + 1])) {+					bezier_points[bi].type = 'C';+					bezier_points[bi].svg_type = 'C';+										+					cx = parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = parse_double (c[++i]);+					} else {+						cy = -parse_double (c[++i]);+					}+									+					bezier_points[bi].x0 = cx;+					bezier_points[bi].y0 = cy;+					+					cx = parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = parse_double (c[++i]);+					} else {+						cy = -parse_double (c[++i]);+					}+					+					px2 = cx;+					py2 = cy;+					+					bezier_points[bi].x1 = cx;+					bezier_points[bi].y1 = cy;+										+					cx = parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = parse_double (c[++i]);+					} else {+						cy = -parse_double (c[++i]);+					}+					+					bezier_points[bi].x2 = cx;+					bezier_points[bi].y2 = cy;+										+					px = cx;+					py = cy;+					+					bi++;				+				}	+			} else if (c[i] == "q") {+				while (i + 4 < c.length && is_point (c[i + 1])) {+					bezier_points[bi].type = 'Q';+					bezier_points[bi].svg_type = 'q';+										+					cx = px + parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = py + parse_double (c[++i]);+					} else {+						cy = py - parse_double (c[++i]);+					}+					+					bezier_points[bi].x0 = cx;+					bezier_points[bi].y0 = cy;+										+					px2 = cx;+					py2 = cy;+										+					cx = px + parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = py + parse_double (c[++i]);+					} else {+						cy = py - parse_double (c[++i]);+					}+					+					bezier_points[bi].x1 = cx;+					bezier_points[bi].y1 = cy;+										+					px = cx;+					py = cy;+					+					bi++;+				}+			} else if (c[i] == "Q") {++				while (i + 4 < c.length && is_point (c[i + 1])) {+					bezier_points[bi].type = 'Q';+					bezier_points[bi].svg_type = 'Q';+										+					cx = parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = parse_double (c[++i]);+					} else {+						cy = -parse_double (c[++i]);+					}+					+					bezier_points[bi].x0 = cx;+					bezier_points[bi].y0 = cy;+					+					px2 = cx;+					py2 = cy;+										+					cx = parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = parse_double (c[++i]);+					} else {+						cy = -parse_double (c[++i]);+					}+					+					px = cx;+					py = cy;++					bezier_points[bi].x1 = cx;+					bezier_points[bi].y1 = cy;+										+					bi++;					+				}	+			} else if (c[i] == "t") {+				while (i + 2 < c.length && is_point (c[i + 1])) {+					bezier_points[bi].type = 'Q';+					bezier_points[bi].svg_type = 't';+										+					// the first point is the reflection+					cx = 2 * px - px2;+					cy = 2 * py - py2; // if (svg_glyph) ?+					+					bezier_points[bi].x0 = cx;+					bezier_points[bi].y0 = cy;+					+					px2 = cx;+					py2 = cy;+										+					cx = px + parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = py + parse_double (c[++i]);+					} else {+						cy = py - parse_double (c[++i]);+					}+					+					px = cx;+					py = cy;+					+					bezier_points[bi].x1 = px;+					bezier_points[bi].y1 = py;+										+					bi++;+				}+			} else if (c[i] == "T") {+				while (i + 2 < c.length && is_point (c[i + 1])) {+					bezier_points[bi].type = 'Q';+					bezier_points[bi].svg_type = 'T';+										+					// the reflection+					cx = 2 * px - px2;+					cy = 2 * py - py2; // if (svg_glyph) ?+					+					bezier_points[bi].x0 = cx;+					bezier_points[bi].y0 = cy;+										+					px2 = cx;+					py2 = cy;+					+					cx = parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = parse_double (c[++i]);+					} else {+						cy = -parse_double (c[++i]);+					}+					+					px = cx;+					py = cy;+					+					bezier_points[bi].x1 = px;+					bezier_points[bi].y1 = py;+										+					bi++;				+				}+			} else if (c[i] == "s") {+				while (i + 4 < c.length && is_point (c[i + 1])) {+					bezier_points[bi].type = 'C';+					bezier_points[bi].svg_type = 's';+										+					// the first point is the reflection+					cx = 2 * px - px2;+					cy = 2 * py - py2; // if (svg_glyph) ?++					bezier_points[bi].x0 = cx;+					bezier_points[bi].y0 = cy;+															+					cx = px + parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = py + parse_double (c[++i]);+					} else {+						cy = py - parse_double (c[++i]);+					}+					+					px2 = cx;+					py2 = cy;+					+					bezier_points[bi].x1 = px2;+					bezier_points[bi].y1 = py2;+					+					cx = px + parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = py + parse_double (c[++i]);+					} else {+						cy = py - parse_double (c[++i]);+					}+					+					bezier_points[bi].x2 = cx;+					bezier_points[bi].y2 = cy;+												+					px = cx;+					py = cy;+					+					bi++;+				}+			} else if (c[i] == "S") {+				while (i + 4 < c.length && is_point (c[i + 1])) {+					bezier_points[bi].type = 'C';+					bezier_points[bi].svg_type = 'S';+										+					// the reflection+					cx = 2 * px - px2;+					cy = 2 * py - py2; // if (svg_glyph) ?			++					bezier_points[bi].x0 = cx;+					bezier_points[bi].y0 = cy;+					+					// the other two are regular cubic points+					cx = parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = parse_double (c[++i]);+					} else {+						cy = -parse_double (c[++i]);+					}+					+					px2 = cx;+					py2 = cy;+					+					bezier_points[bi].x1 = px2;+					bezier_points[bi].y1 = py2;+					+					cx = parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = parse_double (c[++i]);+					} else {+						cy = -parse_double (c[++i]);+					}+					+					bezier_points[bi].x2 = cx;+					bezier_points[bi].y2 = cy;+					+					px = cx;+					py = cy;	+					+					bi++;				+				}+			} else if (c[i] == "a") {+				while (i + 7 < c.length && is_point (c[i + 1])) {					+					arc_rx = parse_double (c[++i]);+					arc_ry = parse_double (c[++i]);+					+					arc_rotation = parse_double (c[++i]);+					large_arc = parse_int (c[++i]);+					arc_sweep = parse_int (c[++i]);+							+					cx = px + parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = py + parse_double (c[++i]);+					} else {+						cy = py - parse_double (c[++i]);+					}+					+					arc_dest_x = cx;+					arc_dest_y = cy;+					+					add_arc_points (bezier_points, ref bi, px, py, arc_rx, arc_ry, arc_rotation, large_arc == 1, arc_sweep == 1, cx, cy);+					+					px = cx;+					py = cy;+					+					+				}+			} else if (i + 7 < c.length && c[i] == "A") {+				while (is_point (c[i + 1])) {					+					arc_rx = parse_double (c[++i]);+					arc_ry = parse_double (c[++i]);+					+					arc_rotation = parse_double (c[++i]);+					large_arc = parse_int (c[++i]);+					arc_sweep = parse_int (c[++i]);+							+					cx = parse_double (c[++i]);+					+					if (svg_glyph) {+						cy = parse_double (c[++i]);+					} else {+						cy = -parse_double (c[++i]);+					}+					+					arc_dest_x = cx;+					arc_dest_y = cy;+					+					add_arc_points (bezier_points, ref bi, px, py, arc_rx, arc_ry, arc_rotation, large_arc == 1, arc_sweep == 1, cx, cy);++					px = cx;+					py = cy;+					+					+				}+			} else if (c[i] == "z") {+				bezier_points[bi].type = 'z';+				bezier_points[bi].svg_type = 'z';+				+				bi++;+			} else if (c[i] == "Z") {+				bezier_points[bi].type = 'z';+				bezier_points[bi].svg_type = 'z';+									+				bi++;+			} else if (c[i] == "") {+			} else if (c[i] == " ") {+			} else {+				warning (@"Unknown instruction: $(c[i])");+			}+		}+		+		if (bi == 0) { 			warning ("No points in path."); 			return path_list;	 		} 		-		move_and_resize (bezier_points, points, svg_glyph, units, glyph);+		move_and_resize (bezier_points, bi, svg_glyph, units, glyph); 		 		if (format == SvgFormat.ILLUSTRATOR) {-			path_list = create_paths_illustrator (bezier_points, points);+			path_list = create_paths_illustrator (bezier_points, bi); 		} else {-			path_list = create_paths_inkscape (bezier_points, points);+			path_list = create_paths_inkscape (bezier_points, bi); 		}  		// TODO: Find out if it is possible to tie handles.@@ -1101,11 +1614,11 @@ public class SvgParser { 				b[i].y2 += font.base_line; 			} else { 				b[i].x0 += glyph.left_limit;-				b[i].y0 += font.top_position;+				b[i].y0 += font.top_limit; 				b[i].x1 += glyph.left_limit;-				b[i].y1 += font.top_position;+				b[i].y1 += font.top_limit; 				b[i].x2 += glyph.left_limit;-				b[i].y2 += font.top_position;+				b[i].y2 += font.top_limit; 			} 		} 	}@@ -1354,8 +1867,9 @@ public class SvgParser { 		first_left_x = 0; 		first_left_y = 0; -		// FIXME: array boundaries-		for (int i = 0; i < num_b; i++) {			+		ep = new EditPoint ();+		+		for (int i = 0; i < num_b; i++) { 			if (b[i].type == '\0') { 				warning ("Parser error."); 				return path_list;@@ -1393,8 +1907,7 @@ public class SvgParser { 				 				path = new Path (); 				first_point = true;				-			} else if (b[i].type == 'M') {-			} else if (b[i].type == 'L') {+			} else if (b[i].type == 'L' || b[i].type == 'M') {  				if (first_point) { 					first_left_x = b[i].x0;@@ -1402,7 +1915,7 @@ public class SvgParser { 				} 				 				ep = path.add (b[i].x0, b[i].y0);-				ep.set_point_type (PointType.LINE_CUBIC); // TODO: quadratic+				ep.set_point_type (PointType.CUBIC); // TODO: quadratic 				ep.get_right_handle ().set_point_type (PointType.LINE_CUBIC);  				if (b[i -1].type == 'L' || first_point) {@@ -1427,25 +1940,25 @@ public class SvgParser { 					first_left_x = b[i].x0; 					first_left_y = b[i].y0; 				}-				+ 				ep = path.add (b[i].x2, b[i].y2); 				ep.set_point_type (PointType.CUBIC);  				ep.get_right_handle ().set_point_type (PointType.CUBIC); 				ep.get_left_handle ().set_point_type (PointType.CUBIC);-				+ 				ep.get_left_handle ().move_to_coordinate (b[i].x1, b[i].y1);  				if (b[i].type == 'S') { 					smooth_points.add (ep); 				}		 -				if (b[i + 1].type != 'z') {+				if (b[i + 1].type != 'z' && i != num_b - 1) { 					ep.get_right_handle ().move_to_coordinate (b[i + 1].x0, b[i + 1].y0); 				} else { 					ep.get_right_handle ().move_to_coordinate (first_left_x, first_left_y); 				}-								+				 				first_point = false; 			} else { 				warning ("Unknown control point type.");@@ -1483,18 +1996,37 @@ public class SvgParser { 		return path_list; 	} 	-	public static double parse_double (string? s) {-		if (unlikely (is_null (s))) {+	// TODO: implement a default svg parser++	static int parse_int (string? s) {+		if (is_null (s)) {+			warning ("null instead of string");+			return 0;+		}+		+		if (!is_point ((!) s)) {+			warning (@"Expecting an integer got: $((!) s)");+			return 0;+		}+		+		return int.parse ((!) s);+	}+	+	static double parse_double (string? s) {+		if (is_null (s)) { 			warning ("Got null instead of expected string."); 			return 0; 		} 		-		if (unlikely (!is_point ((!) s))) {+		if (!is_point ((!) s)) { 			warning (@"Expecting a double got: $((!) s)"); 			return 0; 		} 		-		return double.parse ((!) s);+		string d = (!) s;+		d = d.replace ("px", "");+		+		return double.parse (d); 	} 	 	static bool is_point (string? s) {@@ -1507,7 +2039,7 @@ public class SvgParser { 	} 	 	Path parse_poly_data (string polygon_points) {-		string data = SvgFile.add_separators (polygon_points);+		string data = add_separators (polygon_points); 		string[] c = data.split (" "); 		Path path; 		BezierPoints[] bezier_points = new BezierPoints[c.length + 1];@@ -1528,7 +2060,7 @@ public class SvgParser { 			}  			bezier_points[bi] = new BezierPoints ();-			bezier_points[bi].type = 'L';+			bezier_points[bi].type == 'L'; 			bezier_points[bi].x0 = parse_double (c[i]); 			bezier_points[bi].y0 = -parse_double (c[i + 1]); 			bi++;@@ -1548,82 +2080,6 @@ public class SvgParser { 		 		return path; 	}--	public static EmbeddedSvg parse_embedded_svg_file (string path) {-		string xml_data;-		-		try {-			FileUtils.get_contents (path, out xml_data);-			return parse_embedded_svg_data (xml_data);-		} catch (GLib.Error error) {-			warning (error.message);-		}-		-		SvgDrawing drawing = new SvgDrawing ();-		return new EmbeddedSvg (drawing);-	}--	public static EmbeddedSvg parse_embedded_svg_data (string xml_data) {-		XmlTree tree = new XmlTree (xml_data);-		SvgDrawing drawing = new SvgDrawing ();	-		SvgFile svg_file = new SvgFile (); --		XmlElement root = tree.get_root ();-		drawing = svg_file.parse_svg_file (root);-		EmbeddedSvg svg = new EmbeddedSvg (drawing);-		svg.svg_data = xml_data;-		return svg;-	}--	/** Convert an SVG arc instruction to a Beziér path. */-	public static void add_arc_points (BezierPoints[] bezier_points, ref int bi, -		double x0, double y0, double rx, double ry, double angle,-		bool largeArcFlag, bool sweepFlag, double x, double y) {-		-		double angleStart, angleExtent;-		double s, step, theta;-		double cx, cy;-		-		cx = 0;-		cy = 0;-		-		// Approximate the path with Beziér points-		SvgBird.get_arc_arguments (x0, y0, rx, ry, angle, largeArcFlag, sweepFlag, x, y,-			out angleStart, out angleExtent, out cx, out cx);-		-		s = (angleExtent > 0) ? 1 : -1;-		step = fabs (angleExtent) / (2 * fabs (angleExtent));--		theta = PI - angleStart - angleExtent;-		-		bezier_points[bi].type = 'C';-		bezier_points[bi].svg_type = 'a';--		bezier_points[bi].x0 = cx + rx * cos (theta);-		bezier_points[bi].y0 = cy + ry * sin (theta);-		-		bi++;-						-		for (double a = 0; a < fabs (angleExtent); a += step) {-			theta = PI - angleStart - angleExtent + s * a;--			return_if_fail (0 <= bi < bezier_points.length);--			bezier_points[bi].type = 'S';-			bezier_points[bi].svg_type = 'a';--			bezier_points[bi].x0 = cx + rx * cos (theta);-			bezier_points[bi].y0 = cy + ry * sin (theta);--			bezier_points[bi].x1 = cx + rx * cos (theta + 1 * step / 4);-			bezier_points[bi].y1 = cy + ry * sin (theta + 1 * step / 4);-			-			bezier_points[bi].x2 = cx + rx * cos (theta + 2 * step / 4);-			bezier_points[bi].y2 = cy + ry * sin (theta + 2 * step / 4);-							-			bi++;-		}-	} }  }diff --git a/libbirdfont/SvgStyle.vala b/libbirdfont/SvgStyle.valanew file mode 100644index 0000000..33a6cdc--- /dev/null+++ b/libbirdfont/SvgStyle.vala@@ -0,0 +1,124 @@+/*+	Copyright (C) 2015 Johan Mattsson++	This library is free software; you can redistribute it and/or modify +	it under the terms of the GNU Lesser General Public License as +	published by the Free Software Foundation; either version 3 of the +	License, or (at your option) any later version.++	This library is distributed in the hope that it will be useful, but +	WITHOUT ANY WARRANTY; without even the implied warranty of +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +	Lesser General Public License for more details.+*/++using B;+using Math;++namespace BirdFont {++public class SvgStyle {+	+	Gee.HashMap<string, string> style;+	+	public SvgStyle () {+		style = new Gee.HashMap<string, string> ();+	}+	+	public LineCap get_line_cap () {+		string l;+		+		if (!style.has_key ("stroke-linecap")) {+			return LineCap.BUTT;+		}+		+		l = style.get ("stroke-linecap");+		+		if (l == "round") {+			return LineCap.ROUND;+		} else if (l == "square") {+			return LineCap.SQUARE;+		}+		+		return LineCap.BUTT; 	+	}+	+	public bool has_stroke () {+		bool s = true;+		+		if (style.has_key ("stroke")) {+			s = style.get ("stroke") != "none";+		}+				+		return get_stroke_width () > 0 && s;+	}+		+	public double get_stroke_width () {+		if (!style.has_key ("stroke-width")) {+			return 0;+		}++		return double.parse (style.get ("stroke-width"));+	}+	+	+	public static SvgStyle parse (Attributes attributes) {+		SvgStyle s = new SvgStyle ();+		+		foreach (Attribute a in attributes) {+			if (a.get_name () == "style") {+				s.parse_key_value_pairs (a.get_content ());+			}+			+			if (a.get_name () == "stroke-width") {+				s.style.set ("stroke-width", a.get_content ());+			}++			if (a.get_name () == "stroke") {+				s.style.set ("stroke", a.get_content ());+			}++			if (a.get_name () == "fill") {+				s.style.set ("fill", a.get_content ());+			}+		}+		+		return s;+	}+	+	void parse_key_value_pairs (string svg_style) {+		string[] p = svg_style.split (";");+		string[] pair;+		string k, v;+		+		foreach (string kv in p) {+			pair = kv.split (":");+			+			if (pair.length != 2) {+				warning ("pair.length != 2");+				continue;+			}+			+			k = pair[0];+			v = pair[1];+			+			style.set (k, v);+		}+	}+	+	public void apply (PathList path_list) {+		foreach (Path p in path_list.paths) {+			if (has_stroke ()) {+				p.stroke = get_stroke_width ();+			} else {+				p.stroke = 0;+			}+			+			p.line_cap = get_line_cap ();+			p.reset_stroke ();+			p.update_region_boundaries ();		+		}+	}+}++}diff --git a/libbirdfont/TabBar.vala b/libbirdfont/TabBar.valaindex ad0d1bc..e086df3 100644--- a/libbirdfont/TabBar.vala+++ b/libbirdfont/TabBar.vala@@ -328,9 +328,11 @@ public class TabBar : GLib.Object { 	public bool close_by_name (string name, bool background_tab = false) { 		int i = 0; 				-		foreach (var t in tabs) {-			if (t.get_display ().get_name () == name) {-				return close_tab (i, background_tab);+		foreach (Tab tab in tabs) {+			if (tab.get_display ().get_name () == name) {+				bool closed = close_tab (i, background_tab);+				redraw_tab_bar (0, 0, width, height);+				return closed; 			} 			 			i++;@@ -466,8 +468,7 @@ public class TabBar : GLib.Object { 		t = tabs.get (index); 		previous_tab = current_tab; 		current_tab = t;--		scroll_to_tab (selected, signal_selected);+		scroll_to_tab (selected, signal_selected);		 	} 	 	private bool has_scroll () {@@ -569,7 +570,7 @@ public class TabBar : GLib.Object { 		 		if (stop_button) { 			MainWindow.abort_task ();-		} else if (over_close_tab >= 0 && over == selected) {+		} else if (over_close_tab >= 0) { 			close_tab (over_close_tab); 		} else { 			select_tab (over);@@ -579,8 +580,8 @@ public class TabBar : GLib.Object { 	public void add_tab (FontDisplay display_item, bool signal_selected = true, GlyphCollection? gc = null) { 		double tab_width = -1; 		bool always_open = false;-		int s = (tabs.size == 0) ? 0 : selected + 1;-		Tab t;+		int position = (tabs.size == 0) ? 0 : selected + 1;+		Tab tab;  		if (MenuTab.has_suppress_event ()) { 			warn_if_test ("Event suppressed");@@ -592,21 +593,21 @@ public class TabBar : GLib.Object { 			tab_width += 36; 		} 		-		t = new Tab (display_item, tab_width, always_open);-		tabs.insert (s,t);+		tab = new Tab (display_item, tab_width, always_open);		+		tabs.insert (position, tab); 		 		if (gc != null) {-			t.set_glyph_collection ((!) gc);+			tab.set_glyph_collection ((!) gc); 		} -		GlyphCanvas.set_display (t.get_display ());+		GlyphCanvas.set_display (tab.get_display ());  		MainWindow.get_glyph_canvas ()-			.set_current_glyph_collection (t.get_glyph_collection ());+			.set_current_glyph_collection (tab.get_glyph_collection ()); 				-		select_tab (s, signal_selected);+		select_tab (position, signal_selected); 	}-	+		 	/** Returns true if the new item was added to the bar. */ 	public bool add_unique_tab (FontDisplay display_item, bool signal_selected = true) { 		bool i;@@ -676,11 +677,13 @@ public class TabBar : GLib.Object { 				Theme.text_color (wheel, "Highlighted 1"); 			} 			+			wheel.set_font_size (progress_size);+			 			double middley = h / 2; 			double middlex = w - (wheel.get_sidebearing_extent () / 2) / scale;-			wheel.set_font_size (progress_size);+			 			wheel.widget_x = middlex;-			wheel.widget_y = middley;+			wheel.widget_y = middley;			 			 			cr.save (); 			if (!has_stop_button ()) {@@ -868,7 +871,7 @@ public class TabBar : GLib.Object { 		} 		 		if (processing) {-			timer = new TimeoutSource (50);+			timer = new TimeoutSource (250); 			timer.set_callback (() => { 				wheel_rotation += 0.008 * 2 * Math.PI; 				diff --git a/libbirdfont/TabContent.vala b/libbirdfont/TabContent.valaindex f45a1af..d21c8fa 100644--- a/libbirdfont/TabContent.vala+++ b/libbirdfont/TabContent.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2014 - 2016 Johan Mattsson+	Copyright (C) 2014 2015 Johan Mattsson  	This library is free software; you can redistribute it and/or modify 	it under the terms of the GNU Lesser General Public License as@@ -72,7 +72,12 @@ public class TabContent : GLib.Object { 	public static void draw (WidgetAllocation allocation, Context cr) { 		AbstractMenu menu; 		Dialog dialog;+		double scollbar_width = 10 * Screen.get_scale (); 		+		if (MainWindow.has_scrollbar()) {+			allocation.width -= (int) scollbar_width;+		}+ 		if (unlikely (MenuTab.has_suppress_event ())) { 			cr.save (); 			Theme.color (cr, "Background 1");@@ -110,12 +115,10 @@ public class TabContent : GLib.Object { 			if (text_input_visible) { 				draw_text_input (allocation, cr); 			}-		} -		Help help = MainWindow.get_help ();-		-		if (help.is_visible ()) {-			help.draw (cr, allocation);+			if (MainWindow.has_scrollbar()) {+				MainWindow.scrollbar.draw (cr, allocation, scollbar_width);+			} 		} 	} @@ -129,6 +132,10 @@ public class TabContent : GLib.Object { 		}  		alloc = GlyphCanvas.get_allocation ();+		+		double scollbar_width = 10 * Screen.get_scale ();+		alloc.width += (int) scollbar_width;+		 		pause_surface = Screen.create_background_surface (alloc.width, alloc.height); 		cr = new Context ((!) pause_surface); 		cr.scale (Screen.get_scale (), Screen.get_scale ());@@ -150,8 +157,12 @@ public class TabContent : GLib.Object { 		KeyBindings.add_modifier_from_keyval (keyval);  		if (!text_input_visible) {-			MainWindow.get_menu ().process_key_binding_events (keyval);-			GlyphCanvas.current_display.key_press (keyval);+			AbstractMenu menu = MainWindow.get_menu ();+			bool consumed = menu.process_key_binding_events (keyval);+			+			if (!consumed) {+				GlyphCanvas.current_display.key_press (keyval);+			} 		} else { 			text_input.key_press (keyval); 		}@@ -184,7 +195,11 @@ public class TabContent : GLib.Object { 		}  		if (!text_input_visible) {-			GlyphCanvas.current_display.motion_notify (x, y);+			bool consumed = MainWindow.scrollbar.motion (x, y);+			+			if (!consumed) {+				GlyphCanvas.current_display.motion_notify (x, y);+			} 		} else { 			text_input.motion (x, y); 			GlyphCanvas.redraw ();@@ -208,7 +223,11 @@ public class TabContent : GLib.Object { 			text_input.button_release (button, x, y); 			GlyphCanvas.redraw (); 		} else {-			GlyphCanvas.current_display.button_release (button, x, y);+			bool consumed = MainWindow.scrollbar.button_release (button, x, y);+						+			if (!consumed) {			+				GlyphCanvas.current_display.button_release (button, x, y);+			} 		} 	} @@ -219,12 +238,6 @@ public class TabContent : GLib.Object {  		last_press_time = GLib.get_real_time (); -		Help help = MainWindow.get_help ();-		-		if (help.button_press (button, x, y)) {-			return; // event consumed by help text-		}- 		if (MainWindow.get_dialog ().visible) { 			MainWindow.get_dialog ().button_press (button, x, y); 		} else if (!MainWindow.get_menu ().show_menu) {@@ -236,7 +249,11 @@ public class TabContent : GLib.Object { 					hide_text_input (); 				} 			} else {-				GlyphCanvas.current_display.button_press (button, x, y);+				bool consumed = MainWindow.scrollbar.button_press (button, x, y);+				+				if (!consumed) { +					GlyphCanvas.current_display.button_press (button, x, y);+				} 			} 		} 	}@@ -439,7 +456,7 @@ public class TabContent : GLib.Object { 		TabContent.key_release (Key.LOGO_LEFT); 		TabContent.key_release (Key.LOGO_RIGHT); -		if (MainWindow.get_current_display () is Glyph) {+		if (MainWindow.get_current_display () is GlyphTab) { 			TabContent.key_release ((uint) ' '); 		} 	}diff --git a/libbirdfont/TableLayout.vala b/libbirdfont/TableLayout.valaindex aa95cd8..7699725 100644--- a/libbirdfont/TableLayout.vala+++ b/libbirdfont/TableLayout.vala@@ -231,6 +231,7 @@ public class TableLayout : FontDisplay { 	} 	 	public override void selected_canvas () {+		KeyBindings.set_require_modifier (true); 		update_scrollbar (); 		GlyphCanvas.redraw (); 	}@@ -246,6 +247,10 @@ public class TableLayout : FontDisplay { 		scroll = percent * h; 		GlyphCanvas.redraw (); 	}++	public override bool needs_modifier () {+		return true;+	} }  }diff --git a/libbirdfont/Task.vala b/libbirdfont/Task.valaindex eaf83e4..6f63810 100644--- a/libbirdfont/Task.vala+++ b/libbirdfont/Task.vala@@ -69,6 +69,8 @@ public class Task : GLib.Object { 		} 		 		task ();+		+		warning ("Task is done."); 	}  	public void* perform_task() {diff --git a/libbirdfont/Test.vala b/libbirdfont/Test.valaindex cec8f0d..0308090 100644--- a/libbirdfont/Test.vala+++ b/libbirdfont/Test.vala@@ -14,7 +14,7 @@  namespace BirdFont { -public class Test : GLib.Object {+public class Test : Object { 	public Callback callback; 	public string name; 	double time_stamp;diff --git a/libbirdfont/TestCases.vala b/libbirdfont/TestCases.valaindex 913219c..b6ae008 100644--- a/libbirdfont/TestCases.vala+++ b/libbirdfont/TestCases.vala@@ -33,6 +33,7 @@ class TestCases { 		add (test_drawing, "Pen tool"); 		add (test_delete_points, "Delete edit points"); 		add (test_convert_to_quadratic_bezier_path, "Convert to quadratic path");+		add (test_over_path, "Over path"); 		add (test_export, "Export"); 		add (test_background_coordinates, "Background coordinates"); 		add (test_spin_button, "Spin button");@@ -582,6 +583,58 @@ class TestCases { 		 	} +	public static void test_over_path () {+		Glyph g;+		Path p = new Path ();+		Tool pen_tool;+		+		pen_tool = MainWindow.get_toolbox ().get_tool ("pen_tool");+		test_select_action (pen_tool);+		test_open_next_glyph ();+		+		g = MainWindow.get_current_glyph ();++		test_click_action (pen_tool, 3, 10, 10);+		test_click_action (pen_tool, 3, 10, 10);+		test_click_action (pen_tool, 3, 100, 10);+		test_click_action (pen_tool, 3, 100, 100);+		test_click_action (pen_tool, 3, 10, 100);+		test_click_action (pen_tool, 2, 0, 0);++		g.close_path ();++		warn_if_fail (g.active_paths.size == 0);++		g.select_path (50, 50);++		warn_if_fail (g.active_paths.size == 1);+		+		p.add (-10, 10);+		p.add (10, 10);+		p.add (10, -10);+		p.add (-10, -10);+		p.update_region_boundaries();+		g.add_path (p);+		g.close_path ();++		if (!p.is_over_coordinate (0, 0)) {+			warning ("Coordinate 0, 0 is not in path.");+		}+		+		if (!p.is_over_coordinate (-10, 10)) {+			warning ("Corner corrdinate -10, 10 is not in path.");+		}+		+		warn_if_fail (!p.is_over_coordinate (-20, -20));+		+		for (double x = -10; x <= 10; x += 0.1) {+			for (double y = 10; y <= 10; y += 0.1) {+				warn_if_fail (p.is_over_coordinate (x, y));+			} +		} +		+	}+ 	public static void test_convert_to_quadratic_bezier_path () { 		Glyph g; 		Path p, p1;diff --git a/libbirdfont/TextRendering/CachedFont.vala b/libbirdfont/TextRendering/CachedFont.valadeleted file mode 100644index d93368a..0000000--- a/libbirdfont/TextRendering/CachedFont.vala+++ /dev/null@@ -1,99 +0,0 @@-/*-	Copyright (C) 2015 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Gee;--namespace BirdFont {-	-public class CachedFont : GLib.Object {-	public Font? font;--	public double top_limit {-		get { return _top_limit; }-		set { _top_limit = value; }-	}--	public double bottom_limit {-		get { return _bottom_limit; }-		set { _bottom_limit = value; }-	}-	-	public double base_line = 0;-	double _top_limit = 92.77; // FIXME: load before first glyph-	double _bottom_limit = -24.4;-	-	static FallbackFont fallback_font {-		get {-			if (_fallback_font == null) {-				_fallback_font = new FallbackFont ();-			}-			-			return (!) _fallback_font;-		}-	}-	static FallbackFont? _fallback_font = null;--	public CachedFont (Font? font) {-		Glyph? g;-		Glyph glyph;-		-		this.font = font;--		g = get_glyph_by_name ("a");-		if (g != null) {-			glyph = (!) g;-			base_line = glyph.baseline;-			top_limit = glyph.top_limit;-			bottom_limit = glyph.bottom_limit;-		} else {-			warning("No default chararacter found in font.");-		}-	}-	-	public Glyph? get_glyph_by_name (string name) {-		Glyph? g = null;-		Font f;-		Glyph glyph;-		-		if (font != null) {-			f = (!) font;-			g = f.get_glyph_by_name (name);-			-			if (g != null) {-				glyph = (!) g;-				glyph.top_limit = f.top_limit;-				glyph.baseline = f.base_line;-				glyph.bottom_limit = f.bottom_limit;-			}-		}-		-		if (g == null && name.char_count () == 1) {-			f = fallback_font.get_single_glyph_font (name.get_char (0));-			g = f.get_glyph_by_name (name);-			-			if (g == null) {-				return null;-			}-			-			glyph = (!) g;-			glyph.top_limit = f.top_limit;-			glyph.baseline = f.base_line;-			glyph.bottom_limit = f.bottom_limit;	-		}-		-		return g;-	}-}--}diff --git a/libbirdfont/TextRendering/Drawing.vala b/libbirdfont/TextRendering/Drawing.valadeleted file mode 100644index 2de5049..0000000--- a/libbirdfont/TextRendering/Drawing.vala+++ /dev/null@@ -1,50 +0,0 @@-/*-	Copyright (C) 2014 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--namespace BirdFont {--/** Interface for creating drawing callbacks. */-[Compact]-[CCode (ref_function = "bird_font_drawing_ref", unref_function = "bird_font_drawing_unref")]-public class Drawing {-	-	public int iterator_refcount = 1;-		-	public Drawing () {-	}--	public void new_path (double x, double y) {-	}--	public void curve_to (double xb, double yb, double xc, double yc, double xd, double yd) {-	}--	public void close_path (double x, double y) {-	}--	public unowned Drawing @ref () {-		iterator_refcount++;-		return this;-	}-	-	public void unref () {-		if (--iterator_refcount == 0) {-			this.free ();-		}-	}-	-	private extern void free ();-}--}diff --git a/libbirdfont/TextRendering/FallbackFont.vala b/libbirdfont/TextRendering/FallbackFont.valadeleted file mode 100644index 539fe0b..0000000--- a/libbirdfont/TextRendering/FallbackFont.vala+++ /dev/null@@ -1,337 +0,0 @@-/*-	Copyright (C) 2015 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Gee;--[SimpleType]-[CCode (has_type_id = false)]-public extern struct FcConfig {-}--[CCode (cname = "FcInitLoadConfigAndFonts")]-public extern FcConfig* FcInitLoadConfigAndFonts ();--[CCode (cname = "FcConfigAppFontAddDir")]-public extern string* FcConfigAppFontAddDir (FcConfig* config, string path);--[CCode (cname = "FcConfigSetSysRoot")]-public extern void FcConfigSetSysRoot (FcConfig* config, string path);--[CCode (cname = "FcConfigParseAndLoad")]-public extern bool FcConfigParseAndLoad (FcConfig* config, string path, bool complain);--[CCode (cname = "FcConfigSetCurrent")]-public extern void FcConfigSetCurrent (FcConfig* config);--[CCode (cname = "FcConfigCreate")]-public extern FcConfig* FcConfigCreate ();--[CCode (cname = "FcConfigFilename")]-public extern string FcConfigFilename (string path);--[CCode (cname = "find_font")]-public extern string? find_font (FcConfig* font_config, string characters);--[CCode (cname = "find_font_family")]-public extern string? find_font_family (FcConfig* font_config, string characters);--[CCode (cname = "find_font_file")]-public extern string? find_font_file (FcConfig* font_config, string font_name);--namespace BirdFont {--// TODO: use font config-public class FallbackFont : GLib.Object {-	Gee.ArrayList<File> font_directories;-	-	FontFace* default_font = null;-	public static FcConfig* font_config = null;-	static bool font_config_started = false;-	-	string default_font_file_name = "Roboto-Regular.ttf";-	string default_font_family_name = "Roboto";--	Gee.HashMap<unichar, CachePair> glyphs;-	Gee.ArrayList<CachePair> cached;--	public int max_cached_fonts = 300;-	-	string? default_font_file = null;-	-	public FallbackFont () {-		string home = Environment.get_home_dir ();-		font_directories = new Gee.ArrayList<File> ();--		if (!font_config_started) {-			font_config_started = true;-			-			IdleSource idle = new IdleSource ();-			idle.set_callback (() => {-				Task t = new Task (init_font_config);-				MainWindow.native_window.run_non_blocking_background_thread (t);-				return false;-			});-			idle.attach (null);-		}-		-		add_font_folder ("/usr/share/fonts/");-		add_font_folder ("/usr/local/share/fonts/");-		add_font_folder (home + "/.local/share/fonts");-		add_font_folder (home + "/.fonts");-		add_font_folder ("C:\\Windows\\Fonts");-		add_font_folder (home + "/Library/Fonts");-		add_font_folder ("/Library/Fonts");-		add_font_folder ("/Network/Library/Fonts");-		add_font_folder ("/System/Library/Fonts");-		add_font_folder ("/System Folder/Fonts");-		-		glyphs = new Gee.HashMap<unichar, CachePair> ();-		cached = new Gee.ArrayList<CachePair> ();-		-		open_default_font ();-	}-	-	~FallbackFont () {-		if (default_font != null) {-			close_font (default_font);-		}-	}--	public void init_font_config () {-		FcConfig* config;-		-#if MAC-		config = FcConfigCreate();-		-		string bundle = (!) BirdFont.get_settings_directory ().get_path ();-		FcConfigSetSysRoot(config, bundle);-	-		string path = FcConfigFilename((!) SearchPaths.search_file(null, "fontconfig.settings").get_path ());-		bool loaded = FcConfigParseAndLoad(config, path, true);-		-		if (!loaded) {-			warning ("Fontconfig initialization failed.");-		}-		-		FcConfigSetCurrent (config);-#else-		config = FcInitLoadConfigAndFonts ();-#endif--		IdleSource idle = new IdleSource ();-		-		idle.set_callback (() => {-			font_config = config;-			printd("Fontconfig loaded\n");-			return false;-		});-		idle.attach (null);-	}--	public Font get_single_glyph_font (unichar c) {-		Font f;-		unichar last; -		CachePair p;-		-		if (likely (glyphs.has_key (c))) {-			p = glyphs.get (c);-			-			if (p.referenced < int.MAX) {-				p.referenced++;-			}-			-			return p.font;-		}--		// remove glyphs from cache if it is full-		if (cached.size > max_cached_fonts - 100) {-			-			cached.sort ((a, b) => {-				CachePair pa = (CachePair) a;-				CachePair pb = (CachePair) b;-				return pb.referenced - pa.referenced;-			});-			-			int j = 0;-			for (int i = cached.size - 1; i > 0; i--) {-				if (j > 100) {-					break;-				}-				-				j++;-				-				last = cached.get (i).character;-				glyphs.unset (last);-				cached.remove_at (i);-			}-		}-				-		f = get_single_fallback_glyph_font (c);-		p = new CachePair (f, c);-		-		glyphs.set (c, p);-		cached.add (p);-		-		return (Font) f;-	}--	Font get_single_fallback_glyph_font (unichar c) {-		string? font_file;-		BirdFontFile bf_parser;-		Font bf_font;-		StringBuilder? glyph_data;-		FontFace* font;--		bf_font = new Font ();-		font_file = null;-		glyph_data = null;--		// don't use fallback font in private use area-		if (0xe000 <= c <= 0xf8ff) {-			return bf_font;-		}-		-		// control characters-		if (c <= 0x001f || (0x007f <= c <= 0x008d)) {-			return bf_font;-		}-		-		// check if glyph is available in roboto-		if (default_font != null) {-			glyph_data = get_glyph_in_font ((!) default_font, c);-		}-				-		// use fontconfig to find a fallback font-		if (glyph_data == null) {-			font_file = find_font (font_config, (!) c.to_string ());-			if (font_file != null) {-				font = open_font ((!) font_file);-				glyph_data = get_glyph_in_font (font, c);-				close_font (font);-			}-		}-		-		if (glyph_data != null) {-			bf_parser = new BirdFontFile (bf_font);-			bf_parser.load_data (((!) glyph_data).str);-		}--		return bf_font;		-	}--	public StringBuilder? get_glyph_in_font (FontFace* font, unichar c) {-		StringBuilder? glyph_data = null;-		GlyphCollection gc;--		gc = new GlyphCollection (c, (!)c.to_string ());		-		glyph_data = load_glyph (font, (uint) c);--		return glyph_data;-	}-	-	void add_font_folder (string f) {-		File folder = File.new_for_path (f);-		FileInfo? file_info;-		string fn;-		string file_attributes;-		try {-			if (folder.query_exists ()) {-				font_directories.add (folder);-				-				file_attributes = FileAttribute.STANDARD_NAME;-				file_attributes += ",";-				file_attributes += FileAttribute.STANDARD_TYPE;-				var enumerator = folder.enumerate_children (file_attributes, 0);-				-				while ((file_info = enumerator.next_file ()) != null) {-					fn = ((!) file_info).get_name ();--					if (((!)file_info).get_file_type () == FileType.DIRECTORY) {-						add_font_folder ((!) get_child (folder, fn).get_path ());-					}-				}-			}-		} catch (GLib.Error e) {-			warning (e.message);-		}-	}--	File search_font_file (string font_file) {-		File d, f;-		-		for (int i = font_directories.size - 1; i >= 0; i--) {-			d = font_directories.get (i);-			f = get_child (d, font_file);-			-			if (f.query_exists ()) {-				return f;-			}-		}-		-		warning (@"The font $font_file not found");-		return File.new_for_path (font_file);-	}--	public string? get_default_font_file () {-		File font_file;-		string? fn = null;-		-		if (likely (default_font_file != null)) {-			return default_font_file;-		}-		-		font_file = SearchPaths.search_file (null, default_font_file_name);-		-		if (font_file.query_exists ()) {-			fn = (!) font_file.get_path ();-		} else {-			font_file = search_font_file (default_font_file_name);-	-			if (font_file.query_exists ()) {-				fn = (!) font_file.get_path ();-			} else {-				fn = find_font_file (font_config, default_font_family_name);-			}-		}-			-		if (likely (fn != null)) {-			default_font_file = fn;-			return fn;-		}-		-		warning(default_font_family_name + " not found");-		return null;-	}-	-	void open_default_font () {-		string? fn = get_default_font_file ();-		-		if (fn != null) {-			default_font = open_font ((!) fn);-		}-	}-	-	class CachePair : GLib.Object {-		public Font font;-		public unichar character;-		public int referenced = 1;-		-		public CachePair (Font f, unichar c) {-			font = f;-			character = c;-		}-	}-}--}diff --git a/libbirdfont/TextRendering/FontCache.vala b/libbirdfont/TextRendering/FontCache.valadeleted file mode 100644index 5bf2fa3..0000000--- a/libbirdfont/TextRendering/FontCache.vala+++ /dev/null@@ -1,83 +0,0 @@-/*-	Copyright (C) 2014 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Gee;--namespace BirdFont {--/** Thread specific font cache. */	-public class FontCache {	-	public static FallbackFont fallback_font;-	-	static FontCache? default_cache = null;-	Gee.HashMap<string, CachedFont> fonts;-	CachedFont fallback;-	-	public FontCache () {-		if (is_null (fallback_font)) {-			fallback_font = new FallbackFont ();-		}-		-		fallback = new CachedFont (null);-		fonts = new Gee.HashMap<string, CachedFont> ();-	}-	-	public CachedFont get_font (string file_name) {-		CachedFont c;-		Font f;-		bool ok;--		if (file_name == "") {-			return fallback;-		}-		-		if (fonts.has_key (file_name)) {-			c = fonts.get (file_name);-			return c;-		}-		-		f = new Font ();-		f.set_file (file_name);-		ok = f.load ();-		if (!ok) {-			stderr.printf ("Can't load %s\n", file_name);-			return new CachedFont (null);-		}-		-		c = new CachedFont (f);-		-		if (file_name == "") {-			warning ("No file.");-			return c;-		}-		-		fonts.set (file_name, c);-		return c;-	}--	public static FontCache get_default_cache () {-		if (default_cache == null) {-			default_cache = new FontCache ();-		}-		-		return (!) default_cache;-	}--	public CachedFont get_fallback () {-		return fallback;-	}--}--}diff --git a/libbirdfont/TextRendering/LineTextArea.vala b/libbirdfont/TextRendering/LineTextArea.valadeleted file mode 100644index 24b8f11..0000000--- a/libbirdfont/TextRendering/LineTextArea.vala+++ /dev/null@@ -1,33 +0,0 @@-/*-	Copyright (C) 2014 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;-using Math;--namespace BirdFont {--public class LineTextArea : TextArea {--	public LineTextArea (double size) {-		base (size);-		-		single_line = true;-		min_height = size;-		height = min_height;-		-		layout ();-	}-}--}diff --git a/libbirdfont/TextRendering/Text.vala b/libbirdfont/TextRendering/Text.valadeleted file mode 100644index 3e25c5c..0000000--- a/libbirdfont/TextRendering/Text.vala+++ /dev/null@@ -1,592 +0,0 @@-/*-	Copyright (C) 2014 2015 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;-using Math;--namespace BirdFont {-	-/** Test implementation of a birdfont rendering engine. */-public class Text : Widget {-	FontCache font_cache;-	public CachedFont cached_font;-	-	Surface? cache = null;-	-	public string text;-	-	private bool use_cache = true;-	-	GlyphSequence glyph_sequence {-		get {-			if (gs == null) {-				gs = generate_glyphs ();-			}-			-			return (!) gs;-		}-	}-	-	Gee.ArrayList<string> glyph_names;-	GlyphSequence? gs = null;-	-	public delegate void Iterator (Glyph glyph, double kerning, bool last);-	public double font_size;-	double sidebearing_extent = 0;--	public double r = 0;-	public double g = 0;-	public double b = 0;-	public double a = 1;-	double truncated_width = -1;-	-	double margin_left = 0;-	-	public Text (string text = "", double size = 17, double margin_bottom = 0, Color? color = null) {-		this.margin_bottom = margin_bottom;-		font_cache = FontCache.get_default_cache ();-		cached_font = font_cache.get_fallback ();--		if (color != null) {-			Color c = (!) color;-			r = c.r;-			g = c.g;-			b = c.b;-			a = c.a;-		}-		-		set_text (text);-		set_font_size (size);-	}-	-	public void set_use_cache (bool cache) {-		use_cache = cache;-	}-	-	public string get_text () {-		return text;-	}-	-	/** Set font for this text area.-	 * @param font_absolute path to the font file or a file name for one of the font files in search paths.-	 * @return true if the font was found-	 */-	public bool load_font (string font_file) {-		File path;-		File f;-		FontCache fc;-		-		f = File.new_for_path (font_file);-		path = (f.query_exists ()) ? f : SearchPaths.find_file (null, font_file);-		-		fc = FontCache.get_default_cache ();-		cached_font = fc.get_font ((!) path.get_path ());-		gs = generate_glyphs ();-		-		return cached_font.font != null;-	}-	-	public void set_font_size (double height_in_pixels) {-		font_size = height_in_pixels;-		sidebearing_extent = 0;-		-		if (gs == null) { // ensure height is loaded for the font-			gs = generate_glyphs ();-		}-	}--	public void set_font_cache (FontCache font_cache) {-		this.font_cache = font_cache;-	}-	-	public void set_text (string text) {	-		this.text = text;-		gs = null;-		sidebearing_extent = 0;-		cache = null;-	}--	private GlyphSequence generate_glyphs () {-		int index;-		unichar c;-		string name;-		Glyph? g;-		GlyphSequence gs;-		-		gs = new GlyphSequence ();-		-		glyph_names = new Gee.ArrayList<string> ();-		index = 0;-		while (text.get_next_char (ref index, out c)) {-			name = (!) c.to_string ();-			g = cached_font.get_glyph_by_name (name);-			-			gs.glyph.add (g);-			glyph_names.add (name);-		}-		-		return gs;-	}--	public void iterate (Iterator iter) {-		Glyph glyph;-		double w, kern;-		int wi;-		Glyph? prev;-		Glyph? g;-		GlyphSequence word_with_ligatures;-		GlyphRange? gr_left, gr_right;-		GlyphSequence word;-		KerningClasses kc;-		Font empty = Font.empty;-		-		glyph = new Glyph.no_lines ("", '\0');--		w = 0;-		prev = null;-		kern = 0;-	-		word = glyph_sequence;-		wi = 0;-	-		if (cached_font.font != null) {-			word_with_ligatures = word.process_ligatures ((!) cached_font.font);-		} else {-			word_with_ligatures = word.process_ligatures (new Font ());-		}-		-		gr_left = null;-		gr_right = null;-		-		if (cached_font.font != null) {-			kc = ((!) cached_font.font).get_kerning_classes ();-		} else {-			kc = new KerningClasses (empty);-		}	--		if (word_with_ligatures.glyph.size > 0) {-			g = word_with_ligatures.glyph.get (0);-			if (g != null) {-				margin_left = ((!) g).get_left_side_bearing ();-				-				if (margin_left < 0) {-					margin_left = -margin_left;-				} else {-					margin_left = 0;-				}-			}-		}-		-		for (int i = 0; i < word_with_ligatures.glyph.size; i++) {-			g = word_with_ligatures.glyph.get (i);-			-			if (g == null || prev == null || wi == 0) {-				kern = 0;-			} else {-				return_if_fail (wi < word_with_ligatures.ranges.size);-				return_if_fail (wi - 1 >= 0);-				-				gr_left = word_with_ligatures.ranges.get (wi - 1);-				gr_right = word_with_ligatures.ranges.get (wi);--				kern = kc.get_kerning_for_pair (((!) prev).get_name (), ((!) g).get_name (), gr_left, gr_right);-			}-				-			// process glyph-			if (g == null && (0 <= i < glyph_names.size)) {-				g = cached_font.get_glyph_by_name (glyph_names.get (i));-			}-			-			glyph = (g == null) ? new Glyph ("") : (!) g;-			iter (glyph, kern, i + 1 == word_with_ligatures.glyph.size);			-			prev = g;-			wi++;-		}-	}--	// FIXME: some fonts doesn't have on curve extrema-	public double get_extent () {-		double x = 0;-		-		iterate ((glyph, kerning, last) => {-			double x1, y1, x2, y2;-			double lsb;-			-			lsb = glyph.left_limit;-			-			if (!last) {-				x += (glyph.get_width () + kerning) * get_scale (glyph);-			} else {-				glyph.boundaries (out x1, out y1, out x2, out y2);-				x += (x2 - lsb) * get_scale (glyph);-			}-		});-		-		return x;-	}--	public double get_sidebearing_extent () {-		double x ;-		-		if (likely (sidebearing_extent > 0)) {-			return sidebearing_extent;-		}-		-		x = 0;-		-		iterate ((glyph, kerning, last) => {-			double lsb;-			lsb = glyph.left_limit;-			x += (glyph.get_width () + kerning) * get_scale (glyph);-		});-		-		sidebearing_extent = x;-		return x;-	}--	public override double get_height () {-		return font_size;-	}-	-	public double get_acender () {-		double max_height = 0;-		-		iterate ((glyph, kerning, last) => {-			double x1, y1, x2, y2;-			double h;-			glyph.boundaries (out x1, out y1, out x2, out y2);-			h = Math.fmax (y1, y2) - Math.fmin (y1, y2);-			h *= get_scale (glyph) - glyph.baseline * get_scale (glyph);-			if (h > max_height) {-				max_height = h;-			}-		});-		-		return max_height;-	}	--	public override double get_width () {-		double x = 0;-		bool first = true;-		-		iterate ((glyph, kerning, last) => {-			double x1, y1, x2, y2;-			double lsb;-			-			lsb = glyph.left_limit;-			-			if (first) {-				glyph.boundaries (out x1, out y1, out x2, out y2);-				x += (glyph.get_width () + kerning - Math.fmin (x1, x2)) * get_scale (glyph);-				first = false;-			} else if (!last) {-				x += (glyph.get_width () + kerning) * get_scale (glyph);-			} else {-				glyph.boundaries (out x1, out y1, out x2, out y2);-				x += (x2 - lsb) * get_scale (glyph);-			}-		});-		-		return x;-	}--	public double get_decender () {-		double decender_max = get_max_decender ();-		return decender_max > 0 ? decender_max : 0; -	}		--	private double get_max_decender () {-		double decender = 0;-		double decender_max = 0;-		-		iterate ((glyph, kerning, last) => {-			double x1, y1, x2, y2;-			double y;-			glyph.boundaries (out x1, out y1, out x2, out y2);-			y = Math.fmin (y1, y2);-			decender = (glyph.baseline - y) * get_scale (glyph);-			if (decender > decender_max) {-				decender_max = decender;-			}-		});-		-		return decender_max; -	}-		-	public override void draw (Context cr) {-		double descender = cached_font.bottom_limit + cached_font.base_line;-		double y = widget_y + get_height () + get_font_scale () * descender; // FIXME:-		draw_at_baseline (cr, widget_x, y);-	}-	-	public void draw_at_top (Context cr, double px, double py, string cacheid = "") {-		double s = get_font_scale ();-		double y = py + s * (cached_font.top_limit - cached_font.base_line);-		draw_at_baseline (cr, px, y, cacheid);-	}-	-	public void set_source_rgba (double r, double g, double b, double a) {-		if (this.r != r || -			this.g != g || -			this.b != b || -			this.a != a) {-		-			this.r = r;-			this.g = g;-			this.b = b;-			this.a = a;-			cache = null;-		}-	}-	-	public string get_cache_id (int offset_x, int offset_y) {-		string key;-		int64 c;-		-		c = (((int64) (r * 255)) << 24)-			| (((int64) (g * 255)) << 16)-			| (((int64) (b * 255)) << 8)-			| (((int64) (a * 255)) << 0);-		-		// FIXME: use binary key-		key = @"$font_size $c $offset_x $offset_y";-		-		return key;-	}-	-	public void draw_at_baseline (Context cr, double px, double py, string cacheid = "") {-		if (cache == null) {-			cache = draw_on_cache_surface (cacheid);-		}-		-		double screen_scale = Screen.get_scale ();-		double font_scale = get_font_scale ();-		double cache_y = py - font_scale * (cached_font.top_limit - cached_font.base_line);--		cr.save();-		cr.scale (1 / screen_scale, 1 / screen_scale);-		double scaled_x = (px - margin_left) * screen_scale;-		double scaled_y = cache_y * screen_scale;-		cr.set_source_surface ((!) cache, (int) rint (scaled_x), (int) rint (scaled_y));-		cr.paint ();-		cr.restore();-	}-	-	Surface draw_on_cache_surface (string cacheid) {-		double y;-		double ratio;-		double cc_y;-		Context cr;-		Surface cache_surface;-		double screen_scale = Screen.get_scale();-		double h = font_size * screen_scale + 1;--		ratio = get_font_scale ();-		cc_y = (cached_font.top_limit - cached_font.base_line) * ratio;--		// double x = margin_left * ratio;-		double x = 0;-		double w = get_sidebearing_extent () * screen_scale + x + margin_left + 1;-		-		cache_surface = Screen.create_background_surface ((int) w, (int) h);-		cr = new Context (cache_surface);-		cr.scale (screen_scale, screen_scale);--		y = cc_y;--		if (unlikely (cached_font.base_line != 0)) {-			warning ("Base line not zero.");-		}-		-		iterate ((glyph, kerning, last) => {-			double end;-			-			x += kerning * ratio;-			end = x + glyph.get_width () * ratio;-			-			// truncation-			if (truncated_width > 0 && end > truncated_width) {-				return;-			}--			if (use_cache) {-				draw_chached (cr, glyph, kerning, last, x, y, cc_y, -					ratio, cacheid);-			} else {-				draw_without_cache (cr, glyph, kerning, last, x, y, cc_y, ratio);-			}-			-			x = end;-		});-		-		return cache_surface;-	}--	void draw_without_cache (Context cr, Glyph glyph, double kerning, bool last, -		double x, double y, double cc_y, double ratio) {-	-		double lsb;-		-		cr.save ();-		cr.set_source_rgba (r, g, b, a);-		cr.new_path ();--		lsb = glyph.left_limit;--		foreach (Path path in glyph.get_visible_paths ()) {-			draw_path (cr, glyph, path, lsb, x, y, ratio);-		}--		cr.fill ();-		cr.restore ();-		-	}-		-	void draw_chached (Context cr, Glyph glyph, double kerning, bool last, -		double x, double y, double cc_y, double ratio,-		string cacheid = "") {-		-		double lsb;-		Surface cache;-		Surface cached_glyph;-		Context cc;-		string cache_id;-		double glyph_margin_left = glyph.get_left_side_bearing ();-		-		if (glyph_margin_left < 0) {-			glyph_margin_left = -glyph_margin_left;-		} else {-			glyph_margin_left = 0;-		}-		-		double xp = (x - glyph_margin_left * ratio) * Screen.get_scale ();-		double yp = (y - cc_y) * Screen.get_scale ();-		int offset_x, offset_y;--		offset_x = (int) (10 * (xp - (int) xp));-		offset_y = (int) (10 * (yp - (int) yp));-		-		cache_id = (cacheid == "") ? get_cache_id (offset_x, offset_y) : cacheid;-				-		if (!glyph.has_cache (cache_id)) {-			int w = (int) ((2 * glyph_margin_left * ratio + glyph.get_width ()) * ratio) + 2;-			int h = (int) font_size + 2;-			cache = Screen.create_background_surface (w, h);-			cc = new Context (cache);-			-			cc.scale(Screen.get_scale (), Screen.get_scale ());-			-			lsb = glyph.left_limit - glyph_margin_left;--			cc.save ();-			cc.set_source_rgba (r, g, b, a);-			cc.new_path ();--			foreach (Path path in glyph.get_visible_paths ()) {-				draw_path (cc, glyph, path, lsb, glyph_margin_left * ratio + offset_x / 10.0, cc_y + offset_y / 10.0, ratio);-			}-			-			cc.fill ();-			cc.restore ();--			if (use_cache) {-				glyph.set_cache (cache_id, cache);-			}-			-			cached_glyph = cache;-		} else {-			cached_glyph = glyph.get_cache (cache_id);-		}--		cr.save ();-		cr.set_antialias (Cairo.Antialias.NONE);-		cr.scale(1 / Screen.get_scale (), 1 / Screen.get_scale ());-		cr.set_source_surface (cached_glyph,-			(int) xp,-			(int) yp);-		cr.paint ();-		cr.restore ();-	}-	-	void draw_path (Context cr, Glyph glyph, Path path,-		double lsb, double x, double y, double scale) {-			-		EditPoint e, prev;-		double xa, ya, xb, yb, xc, yc, xd, yd;-		double by;-		double s = get_scale (glyph);-		-		if (path.points.size > 0) {-			if (unlikely (path.is_open ())) {-				warning (@"Path is open in $(glyph.get_name ()).");-			}-			-			//path.add_hidden_double_points (); // FIXME: this distorts shapes-				-			prev = path.points.get (path.points.size - 1);-			xa = (prev.x - lsb) * s + x;-			ya = y - prev.y * s;-			cr.move_to (xa, ya);-			-			by = (y - cached_font.base_line * s);-			for (int i = 0; i < path.points.size; i++) {-				e = path.points.get (i).copy ();-				-				PenTool.convert_point_segment_type (prev, e, PointType.CUBIC);-				-				xb = (prev.get_right_handle ().x - lsb) * s + x;-				yb = by - prev.get_right_handle ().y * s;--				xc = (e.get_left_handle ().x - lsb) * s + x;-				yc = by - e.get_left_handle ().y * s;-					-				xd = (e.x - lsb) * s + x;-				yd = by - e.y * s;--				cr.curve_to (xb, yb, xc, yc, xd, yd);-				cr.line_to (xd, yd);-				-				prev = e;-			}-		}-	}--	public double get_baseline_to_bottom (Glyph g) {-		return get_scale (g) * (-g.baseline - g.bottom_limit);-	}--	public double get_scale (Glyph g) {-		double s = g.top_limit - g.bottom_limit;-		-		if (s == 0) {-			s = cached_font.top_limit - cached_font.bottom_limit;-		}-		-		return font_size / s;-	}--	public double get_font_scale () {-		return font_size / (cached_font.top_limit - cached_font.bottom_limit);-	}--	public double get_baseline_to_bottom_for_font () {-		return get_font_scale () * (-cached_font.base_line - cached_font.bottom_limit);-	}-	-	public void truncate (double max_width) {-		truncated_width = max_width;-	}-}--}diff --git a/libbirdfont/TextRendering/TextArea.vala b/libbirdfont/TextRendering/TextArea.valadeleted file mode 100644index 0b9b617..0000000--- a/libbirdfont/TextRendering/TextArea.vala+++ /dev/null@@ -1,1659 +0,0 @@-/*-	Copyright (C) 2014 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;-using Math;--namespace BirdFont {--public class TextArea : Widget {-	-	public double min_width = 500;-	public double min_height = 100;-	public double font_size;-	public double padding = 3.3;-	public bool single_line = false;-	-	protected Color text_color = Color.black ();-	-	public bool draw_carret {-		get { return carret_is_visible; }-		set { -			carret_is_visible = value; -			if (!value) {-				update_selection = false;-				selection_end = carret.copy ();-			}-		}-	}-	public bool carret_is_visible = false;-	public bool draw_border = true;--	public double width;-	public double height;-	-	Carret carret = new Carret ();-	Carret selection_end = new Carret ();-	bool update_selection = false;-	public bool show_selection = false;-	-	public signal void scroll (double pixels);-	public signal void text_changed (string text);-	public signal void enter (string text);-	-	Gee.ArrayList<Paragraph> paragraphs = new Gee.ArrayList<Paragraph>  ();-	private static const int DONE = -2; -	-	int last_paragraph = 0;-	string text;-	int text_length;-	-	Gee.ArrayList<TextUndoItem> undo_items = new Gee.ArrayList<TextUndoItem> ();-	Gee.ArrayList<TextUndoItem> redo_items = new Gee.ArrayList<TextUndoItem> ();-	-	bool store_undo_state_at_next_event = false;-	-	public bool editable;-	-	public TextArea (double font_size = 20, Color? c = null) {-		this.font_size = font_size;-		width = min_width;-		height = min_height;-		editable = true;-		-		if (c != null) {-			text_color = (!) c;-		}-	}--	public override void focus (bool focus) {-		draw_carret = focus;-	}--	public override double get_height () {-		return height + 2 * padding;-	}--	public override double get_width () {-		return width + 2 * padding;-	}--	public void set_font_size (double z) {-		font_size = z;-	}-	-	bool generate_paragraphs () {-		Paragraph paragraph;--		int next_paragraph = -1;-		-		if (is_null (text)) {-			warning ("No text");-			return false;-		}-		-		if (last_paragraph == DONE) {-			return false;-		}-	-		next_paragraph = text.index_of ("\n", last_paragraph);-		-		if (next_paragraph == -1) {-			paragraph = new Paragraph (text.substring (last_paragraph), font_size, paragraphs.size, text_color);-			paragraphs.add (paragraph);-			last_paragraph = DONE;-		} else {-			next_paragraph +=  "\n".length;-			paragraph = new Paragraph (text.substring (last_paragraph, next_paragraph - last_paragraph), font_size, paragraphs.size, text_color);-			paragraphs.add (paragraph);-			last_paragraph = next_paragraph;-		}-		-		return last_paragraph != DONE;-	}-	-	void generate_all_paragraphs () {-		while (generate_paragraphs ()) {-		}-	}-	-	public override void key_press (uint keyval) {-		unichar c;-		TextUndoItem ui;-		-		if (!editable) {-			return;-		}-		-		c = (unichar) keyval;-		-		switch (c) {-			case ' ':-				store_undo_edit_state ();-				add_character (keyval);-				break;-			case 'a':-				if (KeyBindings.has_ctrl () || KeyBindings.has_logo ()) {-					select_all ();-				} else {-					add_character (keyval);-				}-				break;-			case 'c':-				if (KeyBindings.has_ctrl () || KeyBindings.has_logo ()) {-					ClipTool.copy_text (this);-				} else {-					add_character (keyval);-				}-				break;-			case 'v':-				if (KeyBindings.has_ctrl () || KeyBindings.has_logo ()) {-					ClipTool.paste_text (this);-					store_undo_state_at_next_event = true;-				} else {-					add_character (keyval);-				}-				break;-			case 'y':-				if (KeyBindings.has_ctrl () || KeyBindings.has_logo ()) {-					redo ();-				} else {-					add_character (keyval);-				}-				break;-			case 'z':-				if (KeyBindings.has_ctrl () || KeyBindings.has_logo ()) {-					undo ();-				} else {-					add_character (keyval);-				}-				break;-			case Key.RIGHT:-				check_selection ();-				move_carret_next ();-				break;-			case Key.LEFT:-				check_selection ();-				move_carret_previous ();-				break;-			case Key.DOWN:-				check_selection ();-				move_carret_next_row ();-				break;-			case Key.UP:-				check_selection ();-				move_carret_previous_row ();-				break;-			case Key.END:-				check_selection ();-				move_carret_to_end_of_line ();-				break;-			case Key.HOME:-				check_selection ();-				move_carret_to_beginning_of_line ();-				break;-			case Key.BACK_SPACE:-				if (has_selection ()) {-					ui = delete_selected_text ();-					undo_items.add (ui);-					redo_items.clear ();-					store_undo_state_at_next_event = true;-				} else {-					ui = remove_last_character ();-					undo_items.add (ui);-					redo_items.clear ();-					store_undo_state_at_next_event = true;-				}-				text_changed (get_text ());-				break;-			case Key.ENTER:-				store_undo_edit_state ();-				insert_text ("\n");-				-				if (single_line) {-					enter (get_text ());-				}-				break;-			case Key.DEL:-				if (has_selection ()) {-					ui = delete_selected_text ();-					undo_items.add (ui);-					redo_items.clear ();-					store_undo_state_at_next_event = true;-				} else {-					ui = remove_next_character ();-					undo_items.add (ui);-					redo_items.clear ();-					store_undo_state_at_next_event = true;-				}-				text_changed (get_text ());-				break;		-			default:-				if (!KeyBindings.has_ctrl () && !KeyBindings.has_logo ()) {-					add_character (keyval);-				} -				break;-		}-			-		GlyphCanvas.redraw ();-	}-	-	void check_selection () {-		if (!has_selection () && KeyBindings.has_shift ()) {-			show_selection = true;-			selection_end = carret.copy ();-		}-		-		if (!KeyBindings.has_shift ()) {-			show_selection = false;-		}-	}-	-	private void add_character (uint keyval) {-		unichar c = (unichar) keyval;-		string s;--		if (!is_modifier_key (keyval) -			&& !KeyBindings.has_ctrl ()-			&& !KeyBindings.has_alt ()) {-			-			s = (!) c.to_string ();		-			-			if (s.validate ()) {				-				if (store_undo_state_at_next_event) {-					store_undo_edit_state ();-					store_undo_state_at_next_event = false;-				}-				-				insert_text (s);-			}-		}-	}--	Paragraph get_current_paragraph () {-		Paragraph p;-		-		if (unlikely (!(0 <= carret.paragraph < paragraphs.size))) {-			warning (@"No paragraph, index: $(carret.paragraph), size: $(paragraphs.size)");-			p = new Paragraph ("", 0, 0, text_color);-			paragraphs.add (p);-			return p;-		}-		-		p = paragraphs.get (carret.paragraph);-		return p;-	}--	public void set_text (string t) {-		int tl;-		-		if (single_line) {-			text = t.replace ("\n", "").replace ("\r", "");-		} else {-			text = t;-		}-		-		tl = t.length;		-		text_length += tl;-		-		paragraphs.clear ();-		generate_paragraphs ();-		-		return_if_fail (paragraphs.size != 0);-		-		carret.paragraph = paragraphs.size - 1;-		carret.character_index = paragraphs.get (paragraphs.size - 1).text.length;-		selection_end = carret.copy ();-		show_selection = false;-		-		text_changed (get_text ());-	}-	-	Carret get_selection_start () {-		if (carret.paragraph == selection_end.paragraph) {-			return carret.character_index < selection_end.character_index ? carret : selection_end;-		}-		-		return carret.paragraph < selection_end.paragraph ? carret : selection_end;	-	}--	Carret get_selection_stop () {-		if (carret.paragraph == selection_end.paragraph) {-			return carret.character_index > selection_end.character_index ? carret : selection_end;-		}-		-		return carret.paragraph > selection_end.paragraph ? carret : selection_end;		-	}-		-	public string get_selected_text () {-		Carret selection_start, selection_stop;-		int i;-		Paragraph pg;-		StringBuilder sb;-		-		sb = new StringBuilder ();-		-		if (!has_selection ()) {-			return "".dup ();-		}-		-		selection_start = get_selection_start ();-		selection_stop = get_selection_stop ();-		-		if (selection_start.paragraph == selection_stop.paragraph) {-			pg = paragraphs.get (selection_start.paragraph);-			return pg.text.substring (selection_start.character_index, selection_stop.character_index - selection_start.character_index);-		}-		-		pg = paragraphs.get (selection_start.paragraph);-		sb.append (pg.text.substring (selection_start.character_index));-		-		for (i = selection_start.paragraph + 1; i < selection_stop.paragraph; i++) {-			return_val_if_fail (0 <= i < paragraphs.size, "".dup ());-			pg = paragraphs.get (i);-			sb.append (pg.text);-		}--		pg = paragraphs.get (selection_stop.paragraph);-		sb.append (pg.text.substring (0, selection_stop.character_index));-				-		return sb.str;-	}-	-	public void select_all () {-		while (last_paragraph != DONE) {-			generate_paragraphs ();-		}-			-		if (paragraphs.size > 0) {-			carret.paragraph = 0;-			carret.character_index = 0;-			selection_end.paragraph = paragraphs.size - 1;-			selection_end.character_index = paragraphs.get (paragraphs.size - 1).text_length;-			show_selection = true;-		}-	}-	-	public TextUndoItem delete_selected_text () {-		Carret selection_start, selection_stop;-		int i;-		Paragraph pg, pge;-		string e, s, n;-		bool same;-		TextUndoItem ui;-		-		ui = new TextUndoItem (carret);-		-		e = "";-		s = "";-		n = "";-		-		if (!has_selection ()) {-			warning ("No selected text.");-			return ui;-		}-		-		selection_start = get_selection_start ();-		selection_stop = get_selection_stop ();-		-		same = selection_start.paragraph == selection_stop.paragraph;-		-		if (!same) {-			return_val_if_fail (0 <= selection_start.paragraph < paragraphs.size, ui);-			pg = paragraphs.get (selection_start.paragraph);-			s = pg.text.substring (0, selection_start.character_index);--			return_val_if_fail (0 <= selection_stop.paragraph < paragraphs.size, ui);-			pge = paragraphs.get (selection_stop.paragraph);-			e = pge.text.substring (selection_stop.character_index);-							-			if (!s.has_suffix ("\n")) {-				ui.deleted.add (pge.copy ());-				ui.edited.add (pg.copy ());-				-				pg.set_text (s + e);-				pge.set_text ("");-			} else {-				ui.edited.add (pg.copy ());-				ui.edited.add (pge.copy ());-				-				pg.set_text (s);-				pge.set_text (e);-			}-		} else {-			return_val_if_fail (0 <= selection_start.paragraph < paragraphs.size, ui);-			-			pg = paragraphs.get (selection_start.paragraph);-			n = pg.text.substring (0, selection_start.character_index);-			n += pg.text.substring (selection_stop.character_index);-			-			if (n == "") {-				ui.deleted.add (pg.copy ());-				paragraphs.remove_at (selection_start.paragraph);-			} else {-				ui.edited.add (pg.copy ());-			}-			-			pg.set_text (n);-		}-		-		if (e == "" && !same) {-			paragraphs.remove_at (selection_stop.paragraph);-		}-		-		for (i = selection_stop.paragraph - 1; i > selection_start.paragraph; i--) {-			return_val_if_fail (0 <= i < paragraphs.size, ui);-			ui.deleted.add (paragraphs.get (i));-			paragraphs.remove_at (i);-		}-		-		if (s == "" && !same) {-			return_val_if_fail (0 <= selection_start.paragraph < paragraphs.size, ui);-			paragraphs.remove_at (selection_start.paragraph);-		}-		-		carret = selection_start.copy ();-		selection_end = carret.copy ();-				-		show_selection = false;-		update_paragraph_index ();-		layout ();-		-		return ui;-	}-	-	void update_paragraph_index () {-		int i = 0;-		foreach (Paragraph p in paragraphs) {-			p.index = i;-			i++;-		}-	}-	-	public TextUndoItem remove_last_character () {-		TextUndoItem ui;-		move_carret_previous ();-		ui = remove_next_character ();-		return ui;-	}-	-	public TextUndoItem remove_next_character () {-		Paragraph paragraph;-		Paragraph next_paragraph;-		int index;-		unichar c;-		string np;-		TextUndoItem ui;-		-		ui = new TextUndoItem (carret);-		-		return_val_if_fail (0 <= carret.paragraph < paragraphs.size, ui);-		paragraph = paragraphs.get (carret.paragraph);-		-		index = carret.character_index;-	-		paragraph.text.get_next_char (ref index, out c);-		-		if (index >= paragraph.text_length) {-			np = paragraph.text.substring (0, carret.character_index);-			-			if (carret.paragraph + 1 < paragraphs.size) {-				next_paragraph = paragraphs.get (carret.paragraph + 1);-				paragraphs.remove_at (carret.paragraph + 1);-				-				np = np + next_paragraph.text;-				-				ui.deleted.add (next_paragraph);-			}-			-			paragraph.set_text (np);-			ui.edited.add (paragraph);-		} else {-			np = paragraph.text.substring (0, carret.character_index) + paragraph.text.substring (index);-			paragraph.set_text (np);--			if (np == "") {-				return_val_if_fail (carret.paragraph > 0, ui);-				carret.paragraph--;-				paragraph = paragraphs.get (carret.paragraph);-				carret.character_index = paragraph.text_length;-				-				ui.deleted.add (paragraphs.get (carret.paragraph + 1));-				-				paragraphs.remove_at (carret.paragraph + 1);-			} else {-				ui.edited.add (paragraph);-			}-		}-		-		update_paragraph_index ();-		layout ();--		return ui;-	}-	-	public void move_carret_next () {-		unichar c;-		-		move_carret_one_character ();-		-		if (KeyBindings.has_ctrl ()) {-			while (true) {-				c = move_carret_one_character ();-				-				if (c == '\0' || c == ' ') {-					break;-				}-			}-		}-	}-	-	unichar move_carret_one_character () {-		Paragraph paragraph;-		int index;-		unichar c;-		-		return_val_if_fail (0 <= carret.paragraph < paragraphs.size, '\0');-		paragraph = paragraphs.get (carret.paragraph);-		-		index = carret.character_index;-		-		paragraph.text.get_next_char (ref index, out c);-		-		if (index >= paragraph.text_length && carret.paragraph + 1 < paragraphs.size) {-			carret.paragraph++;-			carret.character_index = 0;-			c = ' ';-		} else {-			carret.character_index = index;-		}-		-		return c;	-	}--	public void move_carret_previous () {-		unichar c;-		-		move_carret_back_one_character ();-		-		if (KeyBindings.has_ctrl ()) {-			while (true) {-				c = move_carret_back_one_character ();-				-				if (c == '\0' || c == ' ') {-					break;-				}-			}-		}-	}-	-	unichar move_carret_back_one_character () {-		Paragraph paragraph;-		int index, last_index;-		unichar c;-		-		return_val_if_fail (0 <= carret.paragraph < paragraphs.size, '\0');-		paragraph = paragraphs.get (carret.paragraph);-		-		index = 0;-		last_index = -1;-		-		while (paragraph.text.get_next_char (ref index, out c) && index < carret.character_index) {-			last_index = index;-		}-		-		if (last_index <= 0 && carret.paragraph > 0) {-			carret.paragraph--;-			-			return_val_if_fail (0 <= carret.paragraph < paragraphs.size, '\0');-			paragraph = paragraphs.get (carret.paragraph);-			carret.character_index = paragraph.text_length;-			-			if (paragraph.text.has_suffix ("\n")) {-				carret.character_index -= "\n".length;-			}-			-			c = ' ';-		} else if (last_index > 0) {-			carret.character_index = last_index;-		} else {-			carret.character_index = 0;-			c = ' ';-		}-		-		return_val_if_fail (0 <= carret.paragraph < paragraphs.size, '\0');-		-		return c;-	}-	-	public void move_carret_next_row () {-		double nr = font_size;-		-		if (carret.desired_y + 2 * font_size >= allocation.height) {-			scroll (2 * font_size);-			nr = -font_size;-		}-		-		if (carret.desired_y + nr < widget_y + height - padding) {-			carret = get_carret_at (carret.desired_x - widget_x - padding, carret.desired_y + nr);-		}-	}--	public void move_carret_to_end_of_line () {-		carret = get_carret_at (widget_x + padding + width, carret.desired_y, false);	-	}--	public void move_carret_to_beginning_of_line () {-		carret = get_carret_at (widget_x, carret.desired_y, false);	-	}-	-	public void move_carret_previous_row () {-		double nr = -font_size;-		-		if (carret.desired_y - 2 * font_size < 0) {-			scroll (-2 * font_size);-			nr = font_size;-		}-		-		if (carret.desired_y + nr > widget_y + padding) {-			carret = get_carret_at (carret.desired_x, carret.desired_y + nr);-		}-	}-	-	public bool has_selection () {-		return show_selection && selection_is_visible ();-	}-	-	private bool selection_is_visible () {-		return carret.paragraph != selection_end.paragraph || carret.character_index != selection_end.character_index;-	}-	-	public void insert_text (string t) {-		string s;-		Paragraph paragraph;-		TextUndoItem ui;-		Gee.ArrayList<string> pgs;-		bool u = false;-		-		pgs = new Gee.ArrayList<string> ();-		-		if (single_line) {-			s = t.replace ("\n", "").replace ("\r", "");-			pgs.add (s);-		} else {-			if (t.last_index_of ("\n") > 0) {-				string[] parts = t.split ("\n");-				int i;-				for (i = 0; i < parts.length -1; i++) {-					pgs.add (parts[i]);-					pgs.add ("\n");-				}--				pgs.add (parts[parts.length - 1]);-				-				if (t.has_suffix ("\n")) {-					pgs.add ("\n");-				}-			} else {-				s = t;-				pgs.add (s);-			}-		}-		-		if (has_selection () && show_selection) {-			ui = delete_selected_text ();-			u = true;-			-			if (paragraphs.size == 0) {-				paragraphs.add (new Paragraph ("", font_size, 0, text_color));-			}-		} else {-			ui = new TextUndoItem (carret);-		}-		-		return_if_fail (0 <= carret.paragraph < paragraphs.size);-		paragraph = paragraphs.get (carret.paragraph);-		-		if (pgs.size > 0) {-			if (!u) {-				ui.edited.add (paragraph.copy ());-			}-			-			string first = pgs.get (0);-			-			string end; -			string nt = paragraph.text.substring (0, carret.character_index);-			-			nt += first;-			end = paragraph.text.substring (carret.character_index);-		-			paragraph.set_text (nt);-			-			int paragraph_index = carret.paragraph;-			Paragraph next_paragraph = paragraph;-			for (int i = 1; i < pgs.size; i++) {-				paragraph_index++;-				string next = pgs.get (i);-				next_paragraph = new Paragraph (next, font_size, paragraph_index, text_color);-				paragraphs.insert (paragraph_index, next_paragraph);-				ui.added.add (next_paragraph);-				u = true;-			}--			carret.paragraph = paragraph_index;-			carret.character_index = next_paragraph.text.length;--			next_paragraph.set_text (next_paragraph.text + end);-		}-		-		if (u) {-			undo_items.add (ui);-			redo_items.clear ();-		}--		update_paragraph_index ();-		layout ();-				-		text_changed (get_text ());-		show_selection = false;-	}-	-	public string get_text () {-		StringBuilder sb = new StringBuilder ();-		-		generate_all_paragraphs ();-		-		foreach (Paragraph p in paragraphs) {-			sb.append (p.text);-		}--		return sb.str;-	}-	-	Carret get_carret_at (double click_x, double click_y, -		bool check_boundaries = true) {-			-		int i = 0;-		double tx, ty;-		double p;-		string w;-		int ch_index;-		double min_d = double.MAX;-		Carret c = new Carret ();-		double dt;--		c.paragraph = -1;-		c.desired_x = click_x;-		c.desired_y = click_y;-		-		foreach (Paragraph paragraph in paragraphs) {-			if (!check_boundaries || paragraph.text_is_on_screen (allocation, widget_y)) {-				ch_index = 0;--				if (paragraph.start_y + widget_y - font_size <= click_y <= paragraph.end_y + widget_y + font_size) { -					foreach (Text next_word in paragraph.words) {-						double tt_click = click_y - widget_y - padding + font_size;--						w = next_word.text;-						-						if (next_word.widget_y <= tt_click <= next_word.widget_y + font_size) {-							-							p = next_word.get_sidebearing_extent ();-								-							if ((next_word.widget_y <= tt_click <= next_word.widget_y + font_size)-								&& (next_word.widget_x + widget_x <= click_x <= next_word.widget_x + widget_x + padding + next_word.get_sidebearing_extent ())) {-														-								tx = widget_x + next_word.widget_x + padding;-								ty = widget_y + next_word.widget_y + padding;-								-								next_word.iterate ((glyph, kerning, last) => {-									double cw;-									int ci;-									double d;-									string gc = (!) glyph.get_unichar ().to_string ();-									-									d = Math.fabs (click_x - tx);-									-									if (d <= min_d) {-										min_d = d;-										c.character_index = ch_index;-										c.paragraph = i;-									}-									-									cw = (glyph.get_width ()) * next_word.get_font_scale () + kerning;-									ci = gc.length;-									-									tx += cw;-									ch_index += ci;-								});--								dt = Math.fabs (click_x - (tx + widget_x + padding));-								if (dt < min_d) {-									min_d = dt;-									c.character_index = ch_index;-									c.paragraph = i;-								}-							} else {-								dt = Math.fabs (click_x - (next_word.widget_x + widget_x + padding + next_word.get_sidebearing_extent ()));-								-								if (dt < min_d) {-									min_d = dt;-									c.character_index = ch_index + w.length;-									-									if (w.has_suffix ("\n")) {-										c.character_index -= "\n".length;-									}-									-									c.paragraph = i;-								}-							-								ch_index += w.length;-							}-						} else {-							ch_index += w.length;-						}-					}-				}-			}-			i++;-		}-		-		if (unlikely (c.paragraph < 0)) {-			c.paragraph = paragraphs.size > 0 ? paragraphs.size - 1 : 0;-			c.character_index = paragraphs.size > 0 ? paragraphs.get (c.paragraph).text.length : 0;-		}-		-		store_undo_state_at_next_event = true;-		-		return c;-	}-	-	/** @return offset to click in text. */-	public override void layout () {-		double p;-		double tx, ty;-		string w;-		double xmax = 0;-		int i = 0;-		double dd;-		-		tx = 0;-		ty = font_size;-		-		if (allocation.width <= 0 || allocation.height <= 0) {-			warning ("Parent widget allocation is not set.");-		}-		-		for (i = paragraphs.size - 1; i >= 0 && paragraphs.size > 1; i--) {-			if (unlikely (paragraphs.get (i).is_empty ())) {-				paragraphs.remove_at (i);-				update_paragraph_index ();-			}-		}-		-		i = 0;-		foreach (Paragraph paragraph in paragraphs) {-			if (paragraph.need_layout -				|| (paragraph.text_area_width != width-					&& paragraph.text_is_on_screen (allocation, widget_y))) {-						-				paragraph.start_y = ty;-				paragraph.start_x = tx;-				-				paragraph.cached_surface = null;-				-				foreach (Text next_word in paragraph.words) {-					next_word.set_font_size (font_size);-					-					w = next_word.text;-					p = next_word.get_sidebearing_extent ();--					if (unlikely (p == 0)) {-						warning (@"Zero width word: $(w)");-					}--					if (w == "") {-						break;-					}--					if (w == "\n") {-						next_word.widget_x = tx;-						next_word.widget_y = ty;-						-						tx = 0;-						ty += next_word.font_size;-					} else {-						if (!single_line) {-							if (tx + p + 2 * padding > width || w == "\n") {-								tx = 0;-								ty += next_word.font_size;-							}-						}--						if (tx + p > xmax) {-							xmax = tx + p;-						}-												-						next_word.widget_x = tx;-						next_word.widget_y = ty;-						-						if (w != "\n") {-							tx += p;-						}-					}-				}--				if (tx > xmax) {-					xmax = tx;-				}-				-				paragraph.text_area_width = width;-				paragraph.width = xmax;-				paragraph.end_x = tx;-				paragraph.end_y = ty;-				paragraph.need_layout = false;-			}-				-			if (xmax > width) {-				break;-			}-								-			tx = paragraph.end_x;-			ty = paragraph.end_y;-			i++;-		}-		-		if (xmax > width) {-			this.width = xmax + 2 * padding;-			layout ();-			return;-		}-		-		this.height = fmax (min_height, ty + 2 * padding);--		if (last_paragraph != DONE) {-			this.height = (text_length / (double) last_paragraph) * ty + 2 * padding; // estimate height-		}-		-		if (ty + widget_y < allocation.height && last_paragraph != DONE) {-			generate_paragraphs ();-			layout ();-			return;-		}--		ty = font_size;-		tx = 0;-		-		foreach (Paragraph paragraph in paragraphs) {-			dd = ty - paragraph.start_y;-			-			if (dd != 0) {-				paragraph.start_y += dd;-				paragraph.end_y += dd;-				foreach (Text word in paragraph.words) {-					word.widget_y += dd;-				}-			}-						-			ty = paragraph.end_y;-		}-	}-	-	public override void button_press (uint button, double x, double y) {-		if (is_over (x, y)) {-			carret = get_carret_at (x, y);-			selection_end = carret.copy ();-			update_selection = true;-		}-	}--	public override void button_release (uint button, double x, double y) {-		update_selection = false;-		show_selection = selection_is_visible ();-	}-	-	public override bool motion (double x, double y) {-		if (update_selection) {-			selection_end = get_carret_at (x, y);-			show_selection = selection_is_visible ();-		}-		-		return update_selection;-	}-	-	public override void draw (Context cr) {-		Text word;-		double tx, ty;-		string w;-		double scale;-		double width;-		double x = widget_x;-		double y = widget_y;-		Carret selection_start, selection_stop;-		double carret_x;-		double carret_y;-		-		layout ();-		-		if (draw_border) {-			// background-			cr.save ();-			cr.set_line_width (1);-			Theme.color (cr, "Text Area Background");-			draw_rounded_rectangle (cr, x, y, this.width, this.height - padding, padding);-			cr.fill ();-			cr.restore ();-			-			// border-			cr.save ();-			cr.set_line_width (1);-			Theme.color (cr, "Foreground 1");-			draw_rounded_rectangle (cr, x, y, this.width, this.height - padding, padding);-			cr.stroke ();-			cr.restore ();-		}-		-		cr.save ();--		word = new Text ();-		-		width = this.width - padding;-		x += padding;-		scale = word.get_font_scale ();-		y += font_size;-		-		// draw selection background-		if (has_selection ()) {-			tx = 0;-			ty = 0;-			-			selection_start = get_selection_start ();-			selection_stop = get_selection_stop ();-			-			cr.save ();-			Theme.color (cr, "Highlighted 1");--			for (int i = selection_start.paragraph; i <= selection_stop.paragraph; i++) {-				return_if_fail (0 <= i < paragraphs.size);-				Paragraph pg = paragraphs.get (i);--				if (pg.text_is_on_screen (allocation, widget_y)) {-					int char_index = 0;-					-					foreach (Text next_word in pg.words) {-						double cw = next_word.get_sidebearing_extent ();-						bool paint_background = false;-						bool partial_start = false;-						bool partial_stop = false;-						int wl;-						-						w = next_word.text;-						wl = w.length;-						scale = next_word.get_font_scale ();-												-						if (selection_start.paragraph == selection_stop.paragraph) {-							partial_start = true;-							partial_stop = true;-						} else if (selection_start.paragraph < i < selection_stop.paragraph) {-							paint_background = true;-						} else if (selection_start.paragraph == i) {-							paint_background = true;-							partial_start = true;-						} else if (selection_stop.paragraph == i) {-							paint_background = char_index + wl < selection_stop.character_index;-							partial_stop = !paint_background;-						}-						-						if (paint_background && !(partial_start || partial_stop)) {	-							double selection_y = widget_y + next_word.widget_y + scale * -next_word.cached_font.bottom_limit - font_size;-							cr.rectangle (widget_x + padding + next_word.widget_x - 1, selection_y, cw + 1, font_size);-							cr.fill ();-						}-						-						if (partial_start || partial_stop) {-							int index = char_index;-							double bx = widget_x + padding + next_word.widget_x + (partial_start ? 0 : 1);-							-							next_word.iterate ((glyph, kerning, last) => {-								double cwi;-								int ci;-								bool draw = (index >= selection_start.character_index && partial_start && !partial_stop)-									|| (index < selection_stop.character_index && !partial_start && partial_stop)-									|| (selection_start.character_index <= index < selection_stop.character_index && partial_start && partial_stop);-								-								cwi = (glyph.get_width ()) * next_word.get_font_scale () + kerning;--								if (draw) {-									double selection_y = widget_y + next_word.widget_y + scale * -next_word.cached_font.bottom_limit - font_size;-									cr.rectangle (bx - 1, selection_y, cwi + 1, font_size);-									cr.fill ();-								}-								-								bx += cwi;-								ci = ((!) glyph.get_unichar ().to_string ()).length;-								index += ci;-							});-						}	-					-						char_index += w.length;	-					}-				}-			}-			-			cr.restore ();-		}--		tx = 0;-		ty = 0;	-		-		int first_visible = 0;-		int last_visible;-		int paragraphs_size = paragraphs.size;-		while (first_visible < paragraphs_size) {-			if (paragraphs.get (first_visible).text_is_on_screen (allocation, widget_y)) {-				break;-			}-			first_visible++;-		}-		-		last_visible = first_visible;-		while (last_visible < paragraphs_size) {-			if (!paragraphs.get (last_visible).text_is_on_screen (allocation, widget_y)) {-				last_visible++;-				break;-			}-			last_visible++;-		}	-		-		if (paragraphs_size == 0) {-			if (carret_is_visible) {-				draw_carret_at (cr, widget_x + padding, widget_y + font_size + padding);-			}-			-			return;-		}-		-		Context cc; // cached context-		Paragraph paragraph;-		paragraph = paragraphs.get (0);-		-		tx = paragraph.start_x;-		ty = paragraph.start_y;--		for (int i = first_visible; i < last_visible; i++) {-			paragraph = paragraphs.get (i);-			-			tx = paragraph.start_x;-			ty = paragraph.start_y;--			if (paragraph.cached_surface == null) {				-				paragraph.cached_surface = Screen.create_background_surface ((int) width + 2, paragraph.get_height () + (int) font_size + 2);-				cc = new Context ((!) paragraph.cached_surface);-				cc.scale (Screen.get_scale(), Screen.get_scale());-				-				foreach (Text next_word in paragraph.words) {-					if (next_word.text != "\n") {-						next_word.draw_at_top (cc, next_word.widget_x, next_word.widget_y - ty);-					}-				}-			}-			-			if (likely (paragraph.cached_surface != null)) {-				// FIXME: subpixel offset in text area-				Screen.paint_background_surface(cr, -					(!) paragraph.cached_surface,-					(int) (x + tx),-					(int) (widget_y + paragraph.start_y - font_size + padding));-			} else {-				warning ("No paragraph image.");-			}-		}--		if (carret_is_visible) {-			get_carret_position (carret, out carret_x, out carret_y);-			-			if (carret_y < 0) {-				draw_carret_at (cr, widget_x + padding, widget_y + font_size + padding);-			} else {-				draw_carret_at (cr, carret_x, carret_y);-			}-		}-		-		if (has_selection ()) {-			get_carret_position (selection_end, out carret_x, out carret_y);-			-			if (carret_y < 0) {-				draw_carret_at (cr, widget_x + padding, widget_y + font_size + padding);-			} else {-				draw_carret_at (cr, carret_x, carret_y);-			}-		}-	}-	-	void get_carret_position (Carret carret, out double carret_x, out double carret_y) {-		Paragraph paragraph;-		double tx;-		double ty;-		int ch_index;-		int wl;-		double pos_x, pos_y;--		ch_index = 0;--		carret_x = -1;-		carret_y = -1;--		return_if_fail (0 <= carret.paragraph < paragraphs.size);-		paragraph = paragraphs.get (carret.paragraph);--		pos_x = -1;-		pos_y = -1;-		-		foreach (Text next_word in paragraph.words) {-			string w = next_word.text;-			wl = w.length;--			if (carret.character_index == ch_index) {-				pos_x = next_word.widget_x + widget_x + padding;-				pos_y = widget_y + next_word.widget_y + next_word.get_baseline_to_bottom_for_font ();		-			} else if (carret.character_index >= ch_index + wl) {-				pos_x = next_word.widget_x + next_word.get_sidebearing_extent () + widget_x + padding;-				pos_y = widget_y + next_word.widget_y + next_word.get_baseline_to_bottom_for_font ();-				-				if (next_word.text.has_suffix ("\n")) {-					pos_x = widget_x + padding;-					pos_y += next_word.font_size;-				}-			} else if (ch_index < carret.character_index <= ch_index + wl) {-				tx = widget_x + next_word.widget_x;-				ty = widget_y + next_word.widget_y + next_word.get_baseline_to_bottom_for_font ();-		-				if (carret.character_index <= ch_index) {-					pos_x = widget_x + padding;-					pos_y = ty;-				}--				next_word.iterate ((glyph, kerning, last) => {-					double cw;-					int ci;--					cw = (glyph.get_width ()) * next_word.get_font_scale () + kerning;-					ci = ((!) glyph.get_unichar ().to_string ()).length;-					-					if (ch_index < carret.character_index <= ch_index + ci) {-						pos_x = tx + cw + padding;-						pos_y = ty;-						-						if (glyph.get_unichar () == '\n') {-							pos_x = widget_x + padding;-							pos_y += next_word.font_size;-						}-					}-					-					tx += cw;-					ch_index += ci;-				});-			}-			-			ch_index += wl;-		}-		-		carret_x = pos_x;-		carret_y = pos_y;-	}-	-	void draw_carret_at (Context cr, double x, double y) {-		cr.save ();-		cr.set_source_rgba (0, 0, 0, 0.5);-		cr.set_line_width (1);-		cr.move_to (x, y);-		cr.line_to (x, y - font_size);-		cr.stroke ();-		cr.restore ();	-	}--	public void store_undo_edit_state () {-		TextUndoItem ui = new TextUndoItem (carret);-		ui.edited.add (get_current_paragraph ().copy ());-		undo_items.add (ui);-		redo_items.clear ();-	}-	-	public void redo () {-		TextUndoItem i;-		TextUndoItem undo_item;-		-		if (redo_items.size > 0) {-			i = redo_items.get (redo_items.size - 1); -			-			undo_item = new TextUndoItem (i.carret);-			-			i.deleted.sort ((a, b) => {-				Paragraph pa = (Paragraph) a;-				Paragraph pb = (Paragraph) b;-				return pb.index - pa.index;-			});--			i.added.sort ((a, b) => {-				Paragraph pa = (Paragraph) a;-				Paragraph pb = (Paragraph) b;-				return pa.index - pb.index;-			});--			foreach (Paragraph p in i.deleted) {-				if (unlikely (!(0 <= p.index < paragraphs.size))) {-					warning ("Paragraph not found.");-				} else {-					undo_item.deleted.add (p.copy ());-					paragraphs.remove_at (p.index);-				}-			}-						-			foreach (Paragraph p in i.added) {-				if (p.index == paragraphs.size) {-					paragraphs.add (p.copy ());-				} else {-					if (unlikely (!(0 <= p.index < paragraphs.size))) {-						warning (@"Index: $(p.index) out of bounds, size: $(paragraphs.size)");-					} else {-						undo_item.added.add (paragraphs.get (p.index).copy ());-						paragraphs.insert (p.index, p.copy ());-					}-				}-			}--			foreach (Paragraph p in i.edited) {-				if (unlikely (!(0 <= p.index < paragraphs.size))) {-					warning (@"Index: $(p.index ) out of bounds, size: $(paragraphs.size)");-					return;-				}-				-				undo_item.edited.add (paragraphs.get (p.index).copy ());-				paragraphs.set (p.index, p.copy ());-			}			-			-			redo_items.remove_at (redo_items.size - 1);-			undo_items.add (undo_item);-			-			carret = i.carret.copy ();-			layout ();-		}-	}-	-	public void undo () {-		TextUndoItem i;-		TextUndoItem redo_item;-		-		if (undo_items.size > 0) {-			i = undo_items.get (undo_items.size - 1); -			redo_item = new TextUndoItem (i.carret);-			-			i.deleted.sort ((a, b) => {-				Paragraph pa = (Paragraph) a;-				Paragraph pb = (Paragraph) b;-				return pa.index - pb.index;-			});--			i.added.sort ((a, b) => {-				Paragraph pa = (Paragraph) a;-				Paragraph pb = (Paragraph) b;-				return pb.index - pa.index;-			});-			-			foreach (Paragraph p in i.added) {-				if (unlikely (!(0 <= p.index < paragraphs.size))) {-					warning ("Paragraph not found.");-				} else {-					redo_item.added.add (paragraphs.get (p.index).copy ());-					paragraphs.remove_at (p.index);-				}-			}-						-			foreach (Paragraph p in i.deleted) {-				if (p.index == paragraphs.size) {-					paragraphs.add (p.copy ());-				} else {-					if (unlikely (!(0 <= p.index < paragraphs.size))) {-						warning (@"Index: $(p.index) out of bounds, size: $(paragraphs.size)");-					} else {-						redo_item.deleted.add (p.copy ());-						paragraphs.insert (p.index, p.copy ());-					}-				}-			}--			foreach (Paragraph p in i.edited) {-				if (unlikely (!(0 <= p.index < paragraphs.size))) {-					warning (@"Index: $(p.index ) out of bounds, size: $(paragraphs.size)");-					return;-				}-				-				redo_item.edited.add (paragraphs.get (p.index).copy ());-				paragraphs.set (p.index, p.copy ());-			}			-			-			undo_items.remove_at (undo_items.size - 1);-			redo_items.add (redo_item);-			-			carret = i.carret.copy ();-			layout ();-		}-	}-	-	public void set_editable (bool editable) {-		this.editable = editable;-	}-	-	public class TextUndoItem : GLib.Object {-		public Carret carret;-		public Gee.ArrayList<Paragraph> added = new Gee.ArrayList<Paragraph> ();-		public Gee.ArrayList<Paragraph> edited = new Gee.ArrayList<Paragraph> ();-		public Gee.ArrayList<Paragraph> deleted = new Gee.ArrayList<Paragraph> ();-		-		public TextUndoItem (Carret c) {-			carret = c.copy ();-		}-	}-		-	public class Paragraph : GLib.Object {-		public double end_x = -10000;-		public double end_y = -10000;-		-		public double start_x = -10000;-		public double start_y = -10000;-		-		public double width = -10000;-		public double text_area_width = -10000;-		-		public string text;-		-		public Gee.ArrayList<Text> words {-			get {-				if (words_in_paragraph.size == 0) {-					generate_words ();-				}-				-				return words_in_paragraph;-			}-		}-		-		private Gee.ArrayList<Text> words_in_paragraph = new Gee.ArrayList<Text> ();-		public int text_length;-		public bool need_layout = true;-		public Surface? cached_surface = null;-		double font_size;-		public int index;-		Color text_color;-		-		public Paragraph (string text, double font_size, int index, Color c) {-			this.index = index;-			this.font_size = font_size;-			text_color = c;-			set_text (text);-		}--		public Paragraph copy () {-			Paragraph p = new Paragraph (text.dup (), font_size, index, text_color);-			p.need_layout = true;-			return p;-		}--		public bool is_empty () {-			return text == "";-		}--		public void set_text (string t) {-			this.text = t;-			text_length = t.length;-			need_layout = true;-			words.clear ();-			cached_surface = null;-		}--		public int get_height () {-			return (int) (end_y - start_y) + 1;-		}-		-		public int get_width () {-			return (int) width + 1;-		}-		-		public bool text_is_on_screen (WidgetAllocation alloc, double widget_y) {-			bool v = (0 <= start_y + widget_y <= alloc.height)-				|| (0 <= end_y + widget_y <= alloc.height)-				|| (start_y + widget_y <= 0 && alloc.height <= end_y + widget_y);-			return v;-		}--		private void generate_words () {-			string w;-			int p = 0;-			bool carret_at_word_end = false;-			Text word;-			int carret = 0;-			int iter_pos = 0;--			return_if_fail (words_in_paragraph.size == 0);--			while (p < text_length) {-				w = get_next_word (out carret_at_word_end, ref iter_pos, carret);-				-				if (w == "") {-					break;-				}-				-				word = new Text (w, font_size, 0, text_color);-				words_in_paragraph.add (word);-			}-		}--		string get_next_word (out bool carret_at_end_of_word, ref int iter_pos, int carret) {-			int i;-			int ni;-			int pi;-			string n;-			int nl;-			-			carret_at_end_of_word = false;-			-			if (iter_pos >= text_length) {-				carret_at_end_of_word = true;-				return "".dup ();-			}-			-			if (text.get_char (iter_pos) == '\n') {-				iter_pos += "\n".length;-				carret_at_end_of_word = (iter_pos == carret);-				return "\n".dup ();-			}-			-			i = text.index_of (" ", iter_pos);-			pi = i + " ".length;-			-			ni = text.index_of ("\t", iter_pos);-			if (ni != -1 && ni < pi || i == -1) {-				i = ni;-				pi = i  + "\t".length;-			}-			-			ni = text.index_of ("\n", iter_pos);-			if (ni != -1 && ni < pi || i == -1) {-				i = ni;-				pi = i;-			}-			-			if (iter_pos + iter_pos - pi > text_length || i == -1) {-				n = text.substring (iter_pos);-			} else {-				n = text.substring (iter_pos, pi - iter_pos);-			}-			-			nl = n.length;-			if (iter_pos < carret < iter_pos + nl) {-				n = text.substring (iter_pos, carret - iter_pos);-				nl = n.length;-				carret_at_end_of_word = true;-			}-			-			iter_pos += nl;-			-			if (iter_pos == carret) {-				carret_at_end_of_word = true;-			}-			-			return n;-		}-	}-	-	public class Carret : GLib.Object {-		-		public int paragraph = 0;-		-		public int character_index {-			get { -				return ci;-			}-			-			set { -				ci = value;-			}-		}-		-		private int ci = 0;-		-		public double desired_x = 0;-		public double desired_y = 0;-		-		public Carret () {-		}-		-		public void print () {-			stdout.printf (@"paragraph: $paragraph, character_index: $character_index\n");-		}-		-		public Carret copy () {-			Carret c = new Carret ();-			-			c.paragraph = paragraph;-			c.character_index = character_index;-			-			c.desired_x = desired_x;-			c.desired_y = desired_y;-			-			return c;-		}-	}-}--}diff --git a/libbirdfont/TextRendering/fontconfig.c b/libbirdfont/TextRendering/fontconfig.cdeleted file mode 100644index f02b747..0000000--- a/libbirdfont/TextRendering/fontconfig.c+++ /dev/null@@ -1,140 +0,0 @@-/*-	Copyright (C) 2015 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--#include <stdio.h>-#include <glib.h>-#include <fontconfig/fontconfig.h>--gchar* find_font_with_property (FcConfig* fontconfig, const gchar* characters, const gchar* property) {-	FcPattern* pattern;-	FcCharSet* character_set;-	FcObjectSet* font_properties;-	FcFontSet* fonts;-	FcPattern* font;-	FcChar8* path;-	gchar* result;-	gchar* remaining_characters;-	gunichar character;-	-	if (fontconfig == NULL) {-		g_warning("Font config not loaded.");-		return NULL;-	}-	-	result = NULL;-	pattern = FcPatternCreate ();-	-	character_set = FcCharSetCreate ();-	-	remaining_characters = (gchar*) characters;-	while (TRUE) {-		character = g_utf8_get_char (remaining_characters);-		-		if (character == '\0') {-			break;-		}-		-		FcCharSetAddChar(character_set, character);-				-		remaining_characters = g_utf8_next_char (remaining_characters);-	}--	FcPatternAddCharSet (pattern, FC_CHARSET, character_set);-	FcCharSetDestroy (character_set);-	FcPatternAddInteger (pattern, FC_SLANT, FC_SLANT_ROMAN);-	-	FcPatternAddBool(pattern, FC_SCALABLE, FcTrue);-	font_properties = FcObjectSetBuild (property, NULL);	-	fonts = FcFontList (fontconfig, pattern, font_properties);-	-	if (fonts && fonts->nfont > 0) {-		font = fonts->fonts[0];-		if (FcPatternGetString(font, property, 0, &path) == FcResultMatch) {-			result = g_strdup ((gchar*) path);-		}-	}--	if (fonts) {-		FcFontSetDestroy(fonts);-	}--	if (pattern) {-		FcPatternDestroy(pattern);-	}--	return result;-}--/** Find a fallback font for a set of characters.- * @return A path to the font file.- */-gchar* find_font (FcConfig* fontconfig, const gchar* characters) {-	return find_font_with_property (fontconfig, characters, FC_FILE);-}--/** Find a fallback font for a set of characters.- * @return Family name of the font.- */-gchar* find_font_family (FcConfig* fontconfig, const gchar* characters) {-	return find_font_with_property (fontconfig, characters, FC_FAMILY);-}--/** Find a font file from its family name.- * @param font_config fontconfig instance- * @param font_name name of the font- * @return full path to the font file- */-gchar* find_font_file (FcConfig* font_config, const gchar* font_name) {-	const FcChar8* name;-	FcPattern* search_pattern;-	FcPattern* font;-	FcChar8* file;-	gchar* path;-	FcObjectSet* font_properties;-	FcFontSet* fonts;-	int i;--	if (font_config == NULL) {-		g_warning("Font config not loaded.");-		return NULL;-	}-	-	path = NULL;-	name = font_name;--	search_pattern = FcPatternCreate ();-	FcPatternAddString (search_pattern, FC_FAMILY, name);-	FcPatternAddBool (search_pattern, FC_SCALABLE, FcTrue);-	FcPatternAddInteger (search_pattern, FC_WEIGHT, FC_WEIGHT_MEDIUM);-	FcPatternAddInteger (search_pattern, FC_SLANT, FC_SLANT_ROMAN);-		-	font_properties = FcObjectSetBuild (FC_FILE, NULL);-	fonts = FcFontList (font_config, search_pattern, font_properties);-	-	if (fonts->nfont > 0) {-		for (i = 0; i < fonts->nfont; i++) {-			font = fonts->fonts[i];-			-			if (FcPatternGetString(font, FC_FILE, 0, &file) == FcResultMatch) {-				path = g_strdup ((gchar*) file);-				break;-			}-		}-		FcPatternDestroy (font);-	}--	FcPatternDestroy (search_pattern);-	-	return path;-}diff --git a/libbirdfont/Theme.vala b/libbirdfont/Theme.valaindex 9dad90c..12cd082 100644--- a/libbirdfont/Theme.vala+++ b/libbirdfont/Theme.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2015 Johan Mattsson+	Copyright (C) 2015 2016 Johan Mattsson  	This library is free software; you can redistribute it and/or modify  	it under the terms of the GNU Lesser General Public License as @@ -103,16 +103,15 @@ public class Theme : GLib.Object { 		Theme.set_default_color ("Stroke Color", 141 / 255.0, 141 / 255.0, 141 / 255.0, 1); 		Theme.set_default_color ("Handle Color", 141 / 255.0, 141 / 255.0, 141 / 255.0, 1); 		Theme.set_default_color ("Fill Color", 0.5, 0.5, 0.5, 1);-		Theme.set_default_color ("Objects", 0, 0, 0, 1);-+		Theme.set_default_color ("Selected Objects", 35 / 255.0, 131 / 255.0, 194 / 255.0, 1);+		 		Theme.set_default_color ("Background 1", 1, 1, 1, 1); 		Theme.set_default_color ("Dialog Background", 238 / 255.0, 239 / 255.0, 243 / 255.0, 1); 		Theme.set_default_color ("Menu Background", 222 / 255.0, 221 / 255.0, 226 / 255.0, 1); 		Theme.set_default_color ("Default Background", 238 / 255.0, 239 / 255.0, 243 / 255.0, 1); 		Theme.set_default_color ("Headline Background", 110 / 255.0, 113 / 255.0, 130 / 255.0, 1); 		-		Theme.set_default_color ("Checkbox Background", 255 / 255.0, 255 / 255.0, 255 / 255.0, 1);-		+		Theme.set_default_color ("Checkbox Background", 255 / 255.0, 255 / 255.0, 255 / 255.0, 1);				 		Theme.set_default_color ("Foreground 1", 0, 0, 0, 1); 		 		Theme.set_default_color ("Text Foreground", 3 / 255.0, 16 / 255.0, 24 / 255.0, 1);@@ -210,7 +209,7 @@ public class Theme : GLib.Object { 		Theme.set_default_color ("Stroke Color", 141 / 255.0, 141 / 255.0, 141 / 255.0, 1); 		Theme.set_default_color ("Handle Color", 141 / 255.0, 141 / 255.0, 141 / 255.0, 1); 		Theme.set_default_color ("Fill Color", 0.5, 0.5, 0.5, 1);-		Theme.set_default_color ("Objects", 0, 0, 0, 1);+		Theme.set_default_color ("Selected Objects", 35 / 255.0, 131 / 255.0, 194 / 255.0, 1); 		 		Theme.set_default_color ("Background 1", 1, 1, 1, 1); 		Theme.set_default_color ("Dialog Background", 55 / 255.0, 56 / 255.0, 62 / 255.0, 1);@@ -315,7 +314,7 @@ public class Theme : GLib.Object { 		Theme.set_default_color ("Stroke Color", 141 / 255.0, 141 / 255.0, 141 / 255.0, 1); 		Theme.set_default_color ("Handle Color", 141 / 255.0, 141 / 255.0, 141 / 255.0, 1); 		Theme.set_default_color ("Fill Color", 0, 0, 0, 1);-		Theme.set_default_color ("Objects", 0, 0, 0, 1);+		Theme.set_default_color ("Selected Objects", 0, 0, 0, 1); 		 		Theme.set_default_color ("Background 1", 1, 1, 1, 1); 		Theme.set_default_color ("Dialog Background", 1, 1, 1, 1);@@ -324,7 +323,6 @@ public class Theme : GLib.Object { 		Theme.set_default_color ("Headline Background", 0, 0, 0, 1); 		 		Theme.set_default_color ("Checkbox Background", 1, 1, 1, 1);-		 		Theme.set_default_color ("Foreground 1", 0, 0, 0, 1); 		 		Theme.set_default_color ("Text Foreground", 0, 0, 0, 1);@@ -424,7 +422,6 @@ public class Theme : GLib.Object { 			t_("Handle Color"); 			t_("Fill Color"); 			t_("Selected Objects");-			t_("Objects"); 			 			t_("Background 1"); 			t_("Dialog Background");diff --git a/libbirdfont/ThemeTab.vala b/libbirdfont/ThemeTab.valaindex ac280a6..47fab16 100644--- a/libbirdfont/ThemeTab.vala+++ b/libbirdfont/ThemeTab.vala@@ -53,7 +53,6 @@ public class ThemeTab : SettingsDisplay { 			 			select_theme.select_action.connect((self) => { 				string theme_file = self.get_name ();-				TabBar tb; 				Toolbox toolbox; 				 				Preferences.set ("theme", theme_file);@@ -76,17 +75,7 @@ public class ThemeTab : SettingsDisplay { 					e.redraw (); 				} 				-				Toolbox.redraw_tool_box ();-				-				GlyphCanvas.redraw ();-				-				tb = MainWindow.get_tab_bar ();-				tb.redraw (0, 0, tb.width, tb.height);-				-				OverViewItem.label_background = null;-				OverViewItem.selected_label_background = null;-				OverViewItem.label_background_no_menu = null;-				OverViewItem.selected_label_background_no_menu = null;+				redraw_ui (); 			}); 		 			select_theme.set_icon ("theme");@@ -140,6 +129,22 @@ public class ThemeTab : SettingsDisplay { 		} 	} +	public static void redraw_ui (){+		TabBar tb;+		+		Toolbox.redraw_tool_box ();		+				+		GlyphCanvas.redraw ();+				+		tb = MainWindow.get_tab_bar ();+		tb.redraw (0, 0, tb.width, tb.height);+			+		OverViewItem.label_background = null;+		OverViewItem.selected_label_background = null;+		OverViewItem.label_background_no_menu = null;+		OverViewItem.selected_label_background_no_menu = null;		+	}+	 	public static string get_label_from_file_name (string theme) { 		string label; 		diff --git a/libbirdfont/Tool.vala b/libbirdfont/Tool.valaindex e5e2c2e..fc4e756 100644--- a/libbirdfont/Tool.vala+++ b/libbirdfont/Tool.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2012 2014 2016 Johan Mattsson+	Copyright (C) 2012, 2014 Johan Mattsson  	This library is free software; you can redistribute it and/or modify  	it under the terms of the GNU Lesser General Public License as @@ -66,8 +66,6 @@ public class Tool : Widget { 	bool show_bg = true; 	 	public string tip = "";-	string extented_description = "";-	TextArea? help = null; 	 	public bool persistent = false; 	public bool editor_events = false;@@ -84,9 +82,8 @@ public class Tool : Widget { 	public signal void redraw_tool (); 	 	/** Create tool with a certain name and load icon "name".png */-	public Tool (string? name = null, string tip = "", string extended_description = "") {+	public Tool (string? name = null, string tip = "") { 		this.tip = tip;-		this.extented_description = extended_description; 		 		icon_font = new Text (); 		@@ -125,39 +122,12 @@ public class Tool : Widget { 		panel_move_action.connect ((self, x, y) => { 			if (is_active ()) { 				wait_for_tooltip ();-				-				Help help_box = MainWindow.get_help ();-				-				if (help == null) {-					help = update_help ();-				}-				-				help_box.set_help_text ((!) help); 				redraw (); 			} 			return false; 		}); 	} 	-	public virtual void clear_cache () {-		help = null;-	}-	-	public TextArea? update_help () {-		string t = get_tip ();-		string description = t;-		-		if (t != "" && extented_description != "") {-			description += "\n\n";-		}-		-		if (extented_description != "") {-			description += extented_description;-		}-		-		return Help.create_help_text (description);-	}-	 	public virtual string get_tip () { 		return tip; 	}@@ -251,10 +221,6 @@ public class Tool : Widget { 	} 	 	public string get_key_binding () {-		if (is_null (MainWindow.get_menu ())) {-			return "";-		}-		 		ToolItem? ti = MainWindow.get_menu ().get_item_for_tool (this); 		ToolItem t; 		diff --git a/libbirdfont/ToolItem.vala b/libbirdfont/ToolItem.valaindex 9f163d7..14fa829 100644--- a/libbirdfont/ToolItem.vala+++ b/libbirdfont/ToolItem.vala@@ -18,28 +18,6 @@ public class ToolItem : MenuItem {  	public Tool tool; -	public override uint modifiers { -		get {-			return base.modifiers;-		} -		-		set {-			base.modifiers = value;-			tool.update_help ();-		}-	}-	-	public override unichar key { -		get {-			return base.key;-		} -		-		set {-			base.key = value;-			tool.update_help ();-		}-	}-	 	public ToolItem (Tool tool) { 		base (tool.tip, tool.name); 		diff --git a/libbirdfont/Toolbox.vala b/libbirdfont/Toolbox.valaindex 0084a50..1be6e33 100644--- a/libbirdfont/Toolbox.vala+++ b/libbirdfont/Toolbox.vala@@ -27,6 +27,7 @@ public class Toolbox : GLib.Object  { 	public static OverviewTools overview_tools; 	public static BackgroundTools background_tools;	 	public static SpacingTools spacing_tools;+	public static SpacingClassTools spacing_class_tools; 	public static FileTools file_tools; 	public static ThemeTools theme_tools; 	@@ -64,6 +65,7 @@ public class Toolbox : GLib.Object  { 		overview_tools = new OverviewTools (); 		background_tools = new BackgroundTools (); 		spacing_tools = new SpacingTools ();+		spacing_class_tools = new SpacingClassTools  (); 		file_tools = new FileTools (); 		theme_tools = new ThemeTools (); 		@@ -74,9 +76,10 @@ public class Toolbox : GLib.Object  { 		tool_sets.add (kerning_tools); 		tool_sets.add (preview_tools); 		tool_sets.add (overview_tools);+		tool_sets.add (spacing_class_tools); 		tool_sets.add (background_tools); 		// the menu has all the file_tools commands, it will not be added here-		tool_sets.add (hidden_tools); // tools without a button+		tool_sets.add (hidden_tools); // tools without buttons 		 		current_set = file_tools; 		current_set.selected ();@@ -123,9 +126,14 @@ public class Toolbox : GLib.Object  { 			current_set = (ToolCollection) overview_tools; 		} else if (tab_name == "Backgrounds") { 			current_set = (ToolCollection) background_tools;+		} else if (tab_name == "SpacingClasses") {+			current_set = (ToolCollection) spacing_class_tools; 		} else if (tab_name == "Themes") { 			current_set = (ToolCollection) theme_tools;+		} else if (t != null && ((!) t).get_display () is GlyphTab) {+			current_set = (ToolCollection) drawing_tools; 		} else if (t != null && ((!) t).get_display () is Glyph) {+			warning ("Expecting GlyphTab instead of Glyph."); 			current_set = (ToolCollection) drawing_tools; 		} else { 			current_set = (ToolCollection) file_tools;diff --git a/libbirdfont/TrackTool.vala b/libbirdfont/TrackTool.valaindex e5ebe52..4821339 100644--- a/libbirdfont/TrackTool.vala+++ b/libbirdfont/TrackTool.vala@@ -1,5 +1,5 @@ /*-	Copyright (C) 2014 2015 Johan Mattsson+	Copyright (C) 2014 2015 2016 Johan Mattsson  	This library is free software; you can redistribute it and/or modify  	it under the terms of the GNU Lesser General Public License as @@ -97,16 +97,20 @@ public class TrackTool : Tool { 				 				if (join_paths) { 					ps = get_path_with_end_point (x, y);+					 					if (unlikely (ps == null)) { 						warning ("No end point."); 						return; 					}+					 					end_point = (!) ps;+ 					if (end_point.is_first ()) { 						end_point.path.reverse (); 					}+					+					Path path = end_point.path;					 					glyph.set_active_path (end_point.path);-					add_corner (x, y); 				} else { 					p = new Path (); 					glyph.add_path (p);@@ -121,11 +125,8 @@ public class TrackTool : Tool { 				start_update_timer (); 				drawing = true; 				-				foreach (Object path in glyph.active_paths) {-					if (path is PathObject) {-						// cache merged stroke parts-						((PathObject) path).get_path ().create_full_stroke ();-					}+				foreach (Path path in glyph.active_paths) {+					path.create_full_stroke (); // cache merged stroke parts 				} 			} 		});@@ -149,16 +150,15 @@ public class TrackTool : Tool { 				g = MainWindow.get_current_glyph (); 				 				if (g.active_paths.size > 0) { // set type for last point-					Object o = g.active_paths.get (g.active_paths.size - 1);-					p = ((PathObject) o).get_path ();-									+					p = g.active_paths.get (g.active_paths.size - 1);+					 					if (p.points.size > 1) { 						previous = p.points.get (p.points.size - 1);-						previous.type = DrawingTools.point_type;+						previous.type = PointType.CUBIC; 						previous.set_tie_handle (false);  						previous = p.points.get (0);-						previous.type = DrawingTools.point_type;+						previous.type = PointType.CUBIC; 						previous.set_tie_handle (false); 					} 				}@@ -168,10 +168,9 @@ public class TrackTool : Tool { 					add_endpoint_and_merge (x, y); 				} 							-				foreach (Object path in g.active_paths) {-					if (path is PathObject) {-						convert_hidden_points (((PathObject) path).get_path ());-					}+				foreach (Path path in g.layers.get_all_paths ().paths) {+					convert_hidden_points (path);+					path.update_region_boundaries (); 				} 				 				g.clear_active_paths ();@@ -227,22 +226,17 @@ public class TrackTool : Tool { 		foreach (EditPoint e in p.points) { 			if (e.type == PointType.HIDDEN) { 				e.type = DrawingTools.point_type;-				e.get_right_handle ().type = DrawingTools.point_type;-				e.get_left_handle ().type = DrawingTools.point_type;+				e.get_right_handle ().type = PointType.CUBIC;+				e.get_left_handle ().type = PointType.CUBIC; 			} 		} 	}-+	+	// FIXME: double check 	void set_tie () { 		Glyph glyph = MainWindow.get_current_glyph (); 		var paths = glyph.get_visible_paths ();-		Path p;-		-		if (paths.size == 0) {-			return;-		}-		-		p = paths.get (paths.size - 1);+		Path p = paths.get (paths.size - 1); 		 		foreach (EditPoint ep in p.points) { 			if (ep.get_right_handle ().is_line () || ep.get_left_handle ().is_line ()) {@@ -303,16 +297,15 @@ public class TrackTool : Tool { 			return; 		} +		EditPoint last_point = p.get_last_point ();+		EditPointHandle handle = last_point.get_right_handle ();+		handle.convert_to_line ();+		p.recalculate_linear_handles ();++		PenTool.convert_point_type (p.get_last_point (), PointType.CUBIC);+		PenTool.convert_point_type (p.get_first_point (), PointType.CUBIC);+ 		p.create_list ();-		-		if (DrawingTools.get_selected_point_type () == PointType.QUADRATIC) {-			foreach (EditPoint e in p.points) {-				if (e.tie_handles) {-					e.convert_to_curve ();-					e.process_tied_handle ();							-				}-			}-		}  		if (PenTool.is_counter_path (p)) { 			p.force_direction (Direction.COUNTER_CLOCKWISE);@@ -345,10 +338,8 @@ public class TrackTool : Tool { 		 		merged.append_path (b.path); 		-		g = MainWindow.get_current_glyph ();-		+		g = MainWindow.get_current_glyph ();		 		g.add_path (merged);-		 		a.delete_last_point (); 		 		update_corner_handle (a.get_last_point (), b.path.get_first_point ());@@ -360,7 +351,7 @@ public class TrackTool : Tool { 		merged.update_region_boundaries (); 		merged.recalculate_linear_handles (); 		merged.reopen ();-		+ 		return merged; 	} @@ -414,23 +405,27 @@ public class TrackTool : Tool { 			return; 		} 		-		Object o = glyph.active_paths.get (glyph.active_paths.size - 1);+		p = glyph.active_paths.get (glyph.active_paths.size - 1);+		p.reopen ();++		EditPoint last_point = new EditPoint (); 		-		if (unlikely (!(o is PathObject))) {-			warning ("Object is not a path");-			return;+		if (p.points.size > 0) {+			last_point = p.get_last_point (); 		} 		-		p = ((PathObject) o).get_path ();-		p.reopen (); 		px = Glyph.path_coordinate_x (x); 		py = Glyph.path_coordinate_y (y);-		new_point = p.add (px, py);+		+		new_point = new EditPoint (px, py, PointType.CUBIC);+		p.add_point (new_point); 		added_points++;  		PenTool.convert_point_to_line (new_point, false);-		new_point.set_point_type (PointType.HIDDEN);		+		new_point.set_point_type (PointType.HIDDEN); 		p.recalculate_linear_handles_for_point (new_point);++		last_point.get_right_handle ().length = 0.000001;		 		 		if (p.points.size > 1) { 			glyph.redraw_segment (new_point, new_point.get_prev ());@@ -472,29 +467,28 @@ public class TrackTool : Tool { 			update_cycles = 0; 		} 		-		if (update_cycles > 4) { // cycles of 100 ms+		if (update_cycles > 0.7 * 10) { // delay in time 			convert_points_to_line ();-			last_update  = get_current_time ();+			last_update = get_current_time (); 			add_corner (last_x, last_y); 			added_points = 0; 			update_cycles = 0; 		} 			-		if (added_points > 25 / samples_per_point) {-			last_update  = get_current_time ();+		if (added_points > 80 / samples_per_point) {+			last_update = get_current_time (); 			convert_points_to_line (); 		} 	} 	 	/** Add a sharp corner instead of a smooth curve. */-	void add_corner (int px, int py) {-		PointSelection p;-		delete_last_points_at (px, py);-		p = PenTool.add_new_edit_point (px, py);-		p.point.set_tie_handle (false);-		p.point.get_left_handle ().convert_to_line ();-		p.point.get_right_handle ().convert_to_line ();-		p.path.recalculate_linear_handles_for_point (p.point);+	void add_corner (double px, double py) {+		EditPoint p;+		p = new EditPoint (px, py, PointType.CUBIC);+		p.set_tie_handle (false);+		p.get_left_handle ().convert_to_line ();+		p.get_right_handle ().convert_to_line ();+		get_active_path ().recalculate_linear_handles_for_point (p); 		last_update = get_current_time (); 		MainWindow.get_current_glyph ().update_view (); 	}@@ -507,20 +501,11 @@ public class TrackTool : Tool { 			return new Path (); 		} 			-		Object o = glyph.active_paths.get (glyph.active_paths.size - 1);-		-		if (likely (o is PathObject)) {-			return ((PathObject) o).get_path ();-		}-		-		warning ("Active object is a path.");-		-		return new Path ();+		return glyph.active_paths.get (glyph.active_paths.size - 1);		 	} 	 	/** Delete all points close to the pixel at x,y. */-	void delete_last_points_at (int x, int y) {-		double px, py;+	void delete_last_points_at (double px, double py) { 		Path p; 					 		p = get_active_path ();@@ -530,9 +515,6 @@ public class TrackTool : Tool { 			return; 		} -		px = Glyph.path_coordinate_x (x);-		py = Glyph.path_coordinate_y (y);- 		while (p.points.size > 0 && is_close (p.points.get (p.points.size - 1), px, py)) { 			p.delete_last_point (); 		}@@ -579,42 +561,22 @@ public class TrackTool : Tool { 		sum_x = 0; 		sum_y = 0; 		-		last_point = p.points.get (p.points.size - 1);+		int start = p.points.size - 1 - added_points;+		int stop = p.points.size - 1; 		-		for (int i = 0; i < added_points; i++) {-			ep = p.delete_last_point ();-			sum_x += ep.x;-			sum_y += ep.y;			-			points.add (ep);-		}+		EditPoint end = p.points.get (stop); 		-		nx = sum_x / added_points;-		ny = sum_y / added_points;--		px = Glyph.reverse_path_coordinate_x (nx);-		py = Glyph.reverse_path_coordinate_y (ny);-		average = PenTool.add_new_edit_point (px, py).point;-		average.type = PointType.HIDDEN;+		Path segment = StrokeTool.fit_bezier_path (p, start, stop, 5.0 / samples_per_point); 		-		// tie handles for all points except for the end points-		average.set_tie_handle (p.points.size > 1); +		for (int i = 0; i < added_points; i++) {+			p.delete_last_point ();+		}		 		-		if (unlikely (p.points.size == 0)) {-			warning ("No points.");-			return;-		}+		p.append_path (segment);+		p.remove_points_on_points ();+		+		add_corner (end.x, end.y); 		-		if (average.prev != null && average.get_prev ().tie_handles) {-			if (p.points.size > 2) {-				previous = average.get_prev ();-				previous.type = DrawingTools.point_type;-				PenTool.convert_point_to_line (previous, true);-				p.recalculate_linear_handles_for_point (previous);-				previous.process_tied_handle ();-				previous.set_tie_handle (false);-			}-		}- 		added_points = 0; 		last_update = get_current_time (); 		glyph.update_view ();diff --git a/libbirdfont/VersionList.vala b/libbirdfont/VersionList.valaindex 926d64e..d40195e 100644--- a/libbirdfont/VersionList.vala+++ b/libbirdfont/VersionList.vala@@ -94,6 +94,8 @@ public class VersionList : GLib.Object { 		if (glyphs.size == 1) { 			over_view.store_undo_state (glyph_collection.copy ()); 			font.delete_glyph (glyph_collection);+			string name = glyph_collection.get_name ();+			MainWindow.get_tab_bar ().close_background_tab_by_name (name); 			return; 		} 		@@ -234,11 +236,12 @@ public class VersionList : GLib.Object {  			tab = (!) tn; -			if (! (tab.get_display () is Glyph)) {+			if (! (tab.get_display () is GlyphTab)) { 				continue;  			} 			-			glyph = (Glyph) tab.get_display ();+			GlyphTab glyph_tab = (GlyphTab) tab.get_display ();+			glyph = glyph_tab.glyphs.get_current (); 			uni.truncate (0); 			uni.append_unichar (glyph.unichar_code); 			ug = font.get_glyph (uni.str);@@ -248,7 +251,7 @@ public class VersionList : GLib.Object { 			}  			updated_glyph = (!) ug;-			tab.set_display (updated_glyph);+			tab.set_display (glyph_tab); 			updated_glyph.view_zoom = glyph.view_zoom; 			updated_glyph.view_offset_x = glyph.view_offset_x; 			updated_glyph.view_offset_y = glyph.view_offset_y;diff --git a/libbirdfont/ZoomTool.vala b/libbirdfont/ZoomTool.valaindex 511fb50..7b407f1 100644--- a/libbirdfont/ZoomTool.vala+++ b/libbirdfont/ZoomTool.vala@@ -36,17 +36,18 @@ public class ZoomTool : Tool { 		}); 			 		press_action.connect((self, b, x, y) => {-			if (b == 1 && KeyBindings.modifier != CTRL) {+			if (b == 1 && !KeyBindings.has_ctrl () && !KeyBindings.has_shift ()) { 				zoom_area_begin_x = x; 				zoom_area_begin_y = y;+				Glyph g = MainWindow.get_current_glyph ();+				g.zoom_area_is_visible = true; 			} 		});  		move_action.connect((self, x, y) => {-			Glyph g;+			Glyph g = MainWindow.get_current_glyph (); 			-			if (zoom_area_begin_x > 0) {-				g = MainWindow.get_current_glyph ();+			if (g.zoom_area_is_visible) { 				g.show_zoom_area (zoom_area_begin_x, zoom_area_begin_y, x, y); 			} 		});@@ -54,7 +55,7 @@ public class ZoomTool : Tool { 		release_action.connect((self, b, x, y) => { 			Glyph g; 						-			if (b == 1 && KeyBindings.modifier != CTRL) {+			if (b == 1 && !KeyBindings.has_ctrl () && !KeyBindings.has_shift ()) { 				store_current_view (); 				 				g =	MainWindow.get_current_glyph ();@@ -65,6 +66,7 @@ public class ZoomTool : Tool { 					g.set_zoom_from_area (); 				} 				+				g.zoom_area_is_visible = false; 				zoom_area_begin_x = -1; 				zoom_area_begin_y = -1; 			}diff --git a/libbirdgems/fit_cubic.c b/libbirdgems/fit_cubic.cindex 863b093..cda61f7 100644--- a/libbirdgems/fit_cubic.c+++ b/libbirdgems/fit_cubic.c@@ -22,10 +22,10 @@ Adapted to BirdFont by Johan Mattsson 2015  #include "GraphicsGems.h" -#ifdef __linux__-#include <malloc.h>+#ifdef MAC+#include <malloc/malloc.h> #else-#include <stdlib.h>+#include <malloc.h> #endif  #include <math.h>diff --git a/libsvgbird/AttributePattern.vala b/libsvgbird/AttributePattern.valadeleted file mode 100644index 722f377..0000000--- a/libsvgbird/AttributePattern.vala+++ /dev/null@@ -1,143 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using B;-using Math;--namespace SvgBird {--public enum AttributePatternType {-	NONE,-	ANYTHING,-	LIST,-	EQUALS,-	STARTS_WITH-}--public class AttributePattern : GLib.Object {-	public string name = "";-	public string? content = null;-	public AttributePatternType type = AttributePatternType.NONE;--	public AttributePattern copy () {-		AttributePattern a = new AttributePattern ();-		a.name = name;-		a.content = content;-		a.type = type;-		return a;-	}-	-	public bool match (Attributes attributes) {-		switch (type) {-		case AttributePatternType.ANYTHING:-			return match_attribute_name (attributes);-		case AttributePatternType.LIST:-			return match_list (attributes);-		case AttributePatternType.EQUALS:-			return attribute_equals (attributes);-		case AttributePatternType.STARTS_WITH:-			return attribute_start_with (attributes);-		}-		-		return false;-	}--	string remove_hypen (string content) {-		int hyphen = content.index_of ("-");-		-		if (hyphen == -1) {-			return content;-		}-		-		return content.substring (0, hyphen);-	}--	bool attribute_start_with (Attributes attributes) {-		foreach (Attribute attribute in attributes) {-			if (attribute.get_name () == name -				&& remove_hypen (attribute.get_content ()) == ((!) content)) {-				return true;-			}-		}-		-		return false;-	}--	bool attribute_equals (Attributes attributes) {-		foreach (Attribute attribute in attributes) {-			if (attribute.get_name () == name -				&& attribute.get_content () == ((!) content)) {-				return true;-			}-		}-		-		return false;-	}-	-	bool match_attribute_name (Attributes attributes) {-		foreach (Attribute attribute in attributes) {-			if (attribute.get_name () == name) {-				return true;-			}-		}-		-		return false;-	}-	-	bool match_list (Attributes attributes) {-		if (content == null) {-			return false;-		}-		-		string[] list = ((!) content).split (" ");-		foreach (Attribute attribute in attributes) {-			if (attribute.get_name () == name) {-				-				string attribute_content = attribute.get_content ();-				foreach (string list_item in list) {-					if (attribute_content == list_item) {-						return true;-					}-				}-			}-		}-		-		return false;-	}--	public string to_string () {-		string c;-		-		if (content == null) {-			c = "null";-		} else {-			c = (!) content;-		}-		-		switch (type) {-		case AttributePatternType.ANYTHING:-			return "[" + name + "]";-		case AttributePatternType.LIST:-			return "[" + name + "~=" + c + "]";-		case AttributePatternType.EQUALS:-			return "[" + name + "=" + c + "]";-		case AttributePatternType.STARTS_WITH:-			return "[" + name + "|=" + c + "]";-		}-		-		return "No attributes.";-	}-}--}diff --git a/libsvgbird/BezierPoints.vala b/libsvgbird/BezierPoints.valadeleted file mode 100644index d9c015a..0000000--- a/libsvgbird/BezierPoints.vala+++ /dev/null@@ -1,45 +0,0 @@-/*-	Copyright (C) 2014 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--namespace SvgBird {--/** Bezier point container for the SVG parser. */-public class BezierPoints {-	public unichar type = '\0';-	public unichar svg_type = '\0';-	public double x0  = 0;-	public double y0 = 0;-	public double x1 = 0;-	public double y1 = 0;-	public double x2 = 0;-	public double y2 = 0;--	// arc arguments-	public double rx = 0; -	public double ry = 0;-	public double angle = 0;-	public bool large_arc = false;-	public bool sweep = false;-	// the arc instructions begins at x0, y0 and ends at x1, x1--	public string to_string () {-		if (svg_type == 'A' || svg_type == 'a') {-			return @"SVG type:$((!) svg_type.to_string ()) $x0,$y0 $x1,$y1 rx=$rx, ry=$ry, angle=$angle, large_arc=$large_arc, sweep=$sweep)";-		}-		-		return @"$((!)type.to_string ()) $x0,$y0 $x1,$y1 $x2,$y2 SVG:$((!)svg_type.to_string ())";-	}-}--}diff --git a/libsvgbird/Circle.vala b/libsvgbird/Circle.valadeleted file mode 100644index 4224d37..0000000--- a/libsvgbird/Circle.vala+++ /dev/null@@ -1,68 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;--namespace SvgBird {--public class Circle : Object {	--	public double cx = 0;-	public double cy = 0;-	public double r = 0;-	-	public Circle () {-	}--	public Circle.create_copy (Circle c) {-		Object.copy_attributes (c, this);-		c.cx = cx;-		c.cx = cy;-		c.r = r;-	}-	-	public override bool is_over (double x, double y) {-		return false;-	}-			-	public override void draw_outline (Context cr) {-		cr.arc (cx, cy, r, 0, 2 * Math.PI);-	}--	public override void move (double dx, double dy) {-	}-	-	public override void update_region_boundaries () {-	}--	public override void rotate (double theta, double xc, double yc) {-	}-	-	public override bool is_empty () {-		return false;-	}-	-	public override void resize (double ratio_x, double ratio_y) {-	}-	-	public override Object copy () {-		return new Circle.create_copy (this);-	}--	public override string to_string () {-		return "Circle";-	}-}--}diff --git a/libsvgbird/ClipPath.vala b/libsvgbird/ClipPath.valadeleted file mode 100644index 3dbcfe4..0000000--- a/libsvgbird/ClipPath.vala+++ /dev/null@@ -1,38 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;--namespace SvgBird {--public class ClipPath : GLib.Object {-	Layer layer = new Layer ();-	-	public string id {-		get {-			return layer.id;-		}-	}-	-	public ClipPath (Layer layer) {-		this.layer = layer;-	}-	-	public void apply (Context cr) {-		layer.draw_outline (cr);-		cr.clip ();-	}-}--}diff --git a/libsvgbird/Color.vala b/libsvgbird/Color.valadeleted file mode 100644index a952a3a..0000000--- a/libsvgbird/Color.vala+++ /dev/null@@ -1,286 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--namespace SvgBird {--public class Color {-	public double r;-	public double g;-	public double b;-	public double a;-	-	public Color (double r, double g, double b, double a) {-		this.r = r;-		this.g = g;-		this.b = b;-		this.a = a;-	}--	public static Color? parse (string? svg_color) {-		if (svg_color == null) {-			return null;-		}-		-		string color = (!) svg_color;-		uint32 c;-		string[] arguments;-		Color parsed = new Color (0, 0, 0, 1);--		if (color == "none") {-			return null;-		}-		-		if (!color.has_prefix ("#")) {-			color = get_hex_for_name (color);-		}-		-		color = color.replace ("#", "");-			-		if (color.char_count () == 6) {-			color.scanf ("%x", out c);-			parsed.r = (uint8)((c & 0xFF0000) >> 16) / 254.0;-			parsed.g = (uint8)((c & 0x00FF00) >> 8)/ 254.0;-			parsed.b = (uint8)(c & 0x0000FF) / 254.0;-		} else if (color.char_count () == 3) {-			color.scanf ("%x", out c);-			parsed.r = (uint8)(((c & 0xF00) >> 4) | ((c & 0xF00) >> 8)) / 254.0;-			parsed.g = (uint8)((c & 0x0F0) | ((c & 0x0F0) >> 4)) / 254.0;-			parsed.b = (uint8)(((c & 0x00F) << 4) | (c & 0x00F)) / 254.0;-		} else if (color.index_of ("%") > -1) {-			color = color.replace ("rgb", "");-			color = color.replace (" ", "");-			color = color.replace ("\t", "");-			color = color.replace ("%", "");-			arguments = color.split (",");-			-			return_val_if_fail (arguments.length == 3, parsed);-			arguments[0].scanf ("%lf", out parsed.r);-			arguments[1].scanf ("%lf", out parsed.g);-			arguments[2].scanf ("%lf", out parsed.b);-		} else if (color.index_of ("rgb") > -1) {-			color = color.replace ("rgb", "");-			color = color.replace (" ", "");-			color = color.replace ("\t", "");-			arguments = color.split (",");-			-			return_val_if_fail (arguments.length == 3, parsed);-			-			int r, g, b;-			arguments[0].scanf ("%d", out r);-			parsed.r = r / 254.0;-			-			arguments[1].scanf ("%d", out g);-			parsed.g = g / 254.0;-			-			arguments[2].scanf ("%d", out b);-			parsed.b = b / 254.0;-		} else {-			warning ("Unknown color type: " + color);-		}-		-		return parsed;- 	}--	public string to_rgb_hex () {-		StringBuilder rgb = new StringBuilder ();-		rgb.append ("#");-		rgb.append_printf ("%02x", (int) Math.rint (r  * 254));-		rgb.append_printf ("%02x", (int) Math.rint (g  * 254));-		rgb.append_printf ("%02x", (int) Math.rint (b  * 254));-		return rgb.str;-	}--	public string to_string () {-		StringBuilder rgba = new StringBuilder ();-		rgba.append (to_rgb_hex ());-		rgba.append_printf ("%x", (int) Math.rint (a  * 254));-		return rgba.str;-	}--	public Color copy () {-		return new Color (r, g, b, a);-	}-	-	public static string get_hex_for_name (string name) {-		string color = name.down ();-		-		if (color == "black") return "#000000";-		if (color == "silver") return "#C0C0C0";-		if (color == "gray") return "#808080";-		if (color == "maroon") return "#800000";-		if (color == "red") return "#FF0000";-		if (color == "purple") return "#800080";-		if (color == "white") return "#FFFFFF";-		if (color == "fuchsia") return "#FF00FF";-		if (color == "green") return "#008000";-		if (color == "lime") return "#00FF00";-		if (color == "olive") return "#808000";-		if (color == "yellow") return "#FFFF00";-		if (color == "navy") return "#000080";-		if (color == "blue") return "#0000FF";-		if (color == "teal") return "#008080";-		if (color == "aqua") return "#00FFFF";-		if (color == "aliceblue") return "#f0f8ff";-		if (color == "antiquewhite") return "#faebd7";-		if (color == "aqua") return "#00ffff";-		if (color == "aquamarine") return "#7fffd4";-		if (color == "azure") return "#f0ffff";-		if (color == "beige") return "#f5f5dc";-		if (color == "bisque") return "#ffe4c4";-		if (color == "black") return "#000000";-		if (color == "blanchedalmond") return "#ffebcd";-		if (color == "blue") return "#0000ff";-		if (color == "blueviolet") return "#8a2be2";-		if (color == "brown") return "#a52a2a";-		if (color == "burlywood") return "#deb887";-		if (color == "cadetblue") return "#5f9ea0";-		if (color == "chartreuse") return "#7fff00";-		if (color == "chocolate") return "#d2691e";-		if (color == "coral") return "#ff7f50";-		if (color == "cornflowerblue") return "#6495ed";-		if (color == "cornsilk") return "#fff8dc";-		if (color == "crimson") return "#dc143c";-		if (color == "cyan") return "#00ffff";-		if (color == "darkblue") return "#00008b";-		if (color == "darkcyan") return "#008b8b";-		if (color == "darkgoldenrod") return "#b8860b";-		if (color == "darkgray") return "#a9a9a9";-		if (color == "darkgreen") return "#006400";-		if (color == "darkgrey") return "#a9a9a9";-		if (color == "darkkhaki") return "#bdb76b";-		if (color == "darkmagenta") return "#8b008b";-		if (color == "darkolivegreen") return "#556b2f";-		if (color == "darkorange") return "#ff8c00";-		if (color == "darkorchid") return "#9932cc";-		if (color == "darkred") return "#8b0000";-		if (color == "darksalmon") return "#e9967a";-		if (color == "darkseagreen") return "#8fbc8f";-		if (color == "darkslateblue") return "#483d8b";-		if (color == "darkslategray") return "#2f4f4f";-		if (color == "darkslategrey") return "#2f4f4f";-		if (color == "darkturquoise") return "#00ced1";-		if (color == "darkviolet") return "#9400d3";-		if (color == "deeppink") return "#ff1493";-		if (color == "deepskyblue") return "#00bfff";-		if (color == "dimgray") return "#696969";-		if (color == "dimgrey") return "#696969";-		if (color == "dodgerblue") return "#1e90ff";-		if (color == "firebrick") return "#b22222";-		if (color == "floralwhite") return "#fffaf0";-		if (color == "forestgreen") return "#228b22";-		if (color == "fuchsia") return "#ff00ff";-		if (color == "gainsboro") return "#dcdcdc";-		if (color == "ghostwhite") return "#f8f8ff";-		if (color == "gold") return "#ffd700";-		if (color == "goldenrod") return "#daa520";-		if (color == "gray") return "#808080";-		if (color == "green") return "#008000";-		if (color == "greenyellow") return "#adff2f";-		if (color == "grey") return "#808080";-		if (color == "honeydew") return "#f0fff0";-		if (color == "hotpink") return "#ff69b4";-		if (color == "indianred") return "#cd5c5c";-		if (color == "indigo") return "#4b0082";-		if (color == "ivory") return "#fffff0";-		if (color == "khaki") return "#f0e68c";-		if (color == "lavender") return "#e6e6fa";-		if (color == "lavenderblush") return "#fff0f5";-		if (color == "lawngreen") return "#7cfc00";-		if (color == "lemonchiffon") return "#fffacd";-		if (color == "lightblue") return "#add8e6";-		if (color == "lightcoral") return "#f08080";-		if (color == "lightcyan") return "#e0ffff";-		if (color == "lightgoldenrodyellow") return "#fafad2";-		if (color == "lightgray") return "#d3d3d3";-		if (color == "lightgreen") return "#90ee90";-		if (color == "lightgrey") return "#d3d3d3";-		if (color == "lightpink") return "#ffb6c1";-		if (color == "lightsalmon") return "#ffa07a";-		if (color == "lightseagreen") return "#20b2aa";-		if (color == "lightskyblue") return "#87cefa";-		if (color == "lightslategray") return "#778899";-		if (color == "lightslategrey") return "#778899";-		if (color == "lightsteelblue") return "#b0c4de";-		if (color == "lightyellow") return "#ffffe0";-		if (color == "lime") return "#00ff00";-		if (color == "limegreen") return "#32cd32";-		if (color == "linen") return "#faf0e6";-		if (color == "magenta") return "#ff00ff";-		if (color == "maroon") return "#800000";-		if (color == "mediumaquamarine") return "#66cdaa";-		if (color == "mediumblue") return "#0000cd";-		if (color == "mediumorchid") return "#ba55d3";-		if (color == "mediumpurple") return "#9370db";-		if (color == "mediumseagreen") return "#3cb371";-		if (color == "mediumslateblue") return "#7b68ee";-		if (color == "mediumspringgreen") return "#00fa9a";-		if (color == "mediumturquoise") return "#48d1cc";-		if (color == "mediumvioletred") return "#c71585";-		if (color == "midnightblue") return "#191970";-		if (color == "mintcream") return "#f5fffa";-		if (color == "mistyrose") return "#ffe4e1";-		if (color == "moccasin") return "#ffe4b5";-		if (color == "navajowhite") return "#ffdead";-		if (color == "navy") return "#000080";-		if (color == "oldlace") return "#fdf5e6";-		if (color == "olive") return "#808000";-		if (color == "olivedrab") return "#6b8e23";-		if (color == "orange") return "#ffa500";-		if (color == "orangered") return "#ff4500";-		if (color == "orchid") return "#da70d6";-		if (color == "palegoldenrod") return "#eee8aa";-		if (color == "palegreen") return "#98fb98";-		if (color == "paleturquoise") return "#afeeee";-		if (color == "palevioletred") return "#db7093";-		if (color == "papayawhip") return "#ffefd5";-		if (color == "peachpuff") return "#ffdab9";-		if (color == "peru") return "#cd853f";-		if (color == "pink") return "#ffc0cb";-		if (color == "plum") return "#dda0dd";-		if (color == "powderblue") return "#b0e0e6";-		if (color == "purple") return "#800080";-		if (color == "red") return "#ff0000";-		if (color == "rosybrown") return "#bc8f8f";-		if (color == "royalblue") return "#4169e1";-		if (color == "saddlebrown") return "#8b4513";-		if (color == "salmon") return "#fa8072";-		if (color == "sandybrown") return "#f4a460";-		if (color == "seagreen") return "#2e8b57";-		if (color == "seashell") return "#fff5ee";-		if (color == "sienna") return "#a0522d";-		if (color == "silver") return "#c0c0c0";-		if (color == "skyblue") return "#87ceeb";-		if (color == "slateblue") return "#6a5acd";-		if (color == "slategray") return "#708090";-		if (color == "slategrey") return "#708090";-		if (color == "snow") return "#fffafa";-		if (color == "springgreen") return "#00ff7f";-		if (color == "steelblue") return "#4682b4";-		if (color == "tan") return "#d2b48c";-		if (color == "teal") return "#008080";-		if (color == "thistle") return "#d8bfd8";-		if (color == "tomato") return "#ff6347";-		if (color == "turquoise") return "#40e0d0";-		if (color == "violet") return "#ee82ee";-		if (color == "wheat") return "#f5deb3";-		if (color == "white") return "#ffffff";-		if (color == "whitesmoke") return "#f5f5f5";-		if (color == "yellow") return "#ffff00";-		if (color == "yellowgreen") return "#9acd32";-		-		return "#000000";-	}-}--}diff --git a/libsvgbird/Defs.vala b/libsvgbird/Defs.valadeleted file mode 100644index 42e06b8..0000000--- a/libsvgbird/Defs.vala+++ /dev/null@@ -1,138 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using B;-using Math;--namespace SvgBird {--public class Defs {-	public Gee.ArrayList<ClipPath> clip_paths = new Gee.ArrayList<ClipPath> ();-	public Gee.ArrayList<Gradient> gradients = new Gee.ArrayList<Gradient> ();-	public StyleSheet style_sheet = new StyleSheet ();--	public void add (Gradient g) {-		gradients.add (g);-	}--	public ClipPath? get_clip_path_for_url (string? url) {-		if (url == null) {-			return null;-		}-		-		string tag_id = get_id_from_url ((!) url);-		return get_clip_path_for_id (tag_id);-	} -	-	public ClipPath? get_clip_path_for_id (string id) {-		string tag_id;-		-		if (id.has_prefix ("#")) {-			tag_id = id.substring ("#".length);-		} else {-			tag_id = id;-		}-		-		foreach (ClipPath clip_path in clip_paths) {-			if (clip_path.id == tag_id) {-				return clip_path;-			}-		}-		-		return null;		-	}-	-	public static string get_id_from_url (string url) {-		if (unlikely (!is_url (url))) {-			return "";-		}--		int p1 = url.index_of ("(");-		if (unlikely (p1 == -1)) {-			warning ("Not an URL: " + url);-			return "";-		}--		int p2 = url.index_of (")");-		if (unlikely (p2 == -1 || p2 < p1)) {-			warning ("Not an URL: " +  url);-			return "";-		}-	-		p1 += "(".length;-		int length = p2 - p1;-		return url.substring (p1, length);-	}-	-	public Gradient? get_gradient_for_url (string? url) {-		if (url == null) {-			return null;-		}-		-		string tag_id = get_id_from_url ((!) url);-		return get_gradient_for_id (tag_id);-	}--	public Gradient? get_gradient_for_id (string id) {-		string tag_id;-		-		if (id.has_prefix ("#")) {-			tag_id = id.substring ("#".length);-		} else {-			tag_id = id;-		}-		-		foreach (Gradient gradient in gradients) {-			if (gradient.id == tag_id) {-				return gradient;-			}-		}-		-		return null;		-	}--	public static bool is_url (string? attribute) {-		if (attribute == null) {-			return false;-		}-		-		return ((!) attribute).has_prefix ("url");-	}--	public Defs shallow_copy () {-		Defs d = new Defs ();-		-		foreach (Gradient g in gradients) {-			d.add (g);-		}-		-		d.style_sheet = style_sheet.shallow_copy ();-		-		return d;-	}--	public Defs copy () {-		Defs d = new Defs ();-		-		foreach (Gradient g in gradients) {-			d.add (g.copy ());-		}-		-		d.style_sheet = style_sheet.copy ();-		-		return d;-	}-}--}diff --git a/libsvgbird/Doubles.vala b/libsvgbird/Doubles.valadeleted file mode 100644index ad6133f..0000000--- a/libsvgbird/Doubles.vala+++ /dev/null@@ -1,91 +0,0 @@-/*-	Copyright (C) 2015 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;--namespace SvgBird {--public class Doubles : GLib.Object {-	public PointValue* data;-	public int size = 0;-	int capacity = 10;-	-	public Doubles () {-		data = new PointValue[capacity];-	}--	~Doubles () {-		delete data;-		data = null;-	}-	-	public Doubles.for_capacity (int capacity) {-		data = new PointValue[capacity];-		this.capacity = capacity;-	}-	-	void increase_capacity () {-		int new_capacity = 2 * capacity;-		PointValue* new_data = new PointValue[new_capacity];-		Posix.memcpy (new_data, data, sizeof (PointValue) * size);-		delete data;-		data = new_data;-		capacity = new_capacity;		-	}--	public void add_type (uchar type) {-		if (size >= capacity) {-			increase_capacity ();-		}--		data[size].type = type;-		size++;-	}--	public void add (double d) {-		if (size >= capacity) {-			increase_capacity ();-		}-		-		data[size].value = d;-		size++;-	}-	-	public Doubles copy () {-		Doubles d = new Doubles ();-		delete d.data;-		d.data = new double[capacity];-		d.capacity = capacity;-		d.size = size;-		Posix.memcpy (d.data, data, sizeof (PointValue) * size);-		return d;-	}-	-	public double get_double (int index) {-		if (unlikely (index < 0)) {-			warning ("index < 0");-			return 0;-		}--		if (unlikely (index >= size)) {-			warning ("index >= size");-			return 0;-		}-		-		return data[index].value;-	}-}--}-diff --git a/libsvgbird/Ellipse.vala b/libsvgbird/Ellipse.valadeleted file mode 100644index 8bf3be8..0000000--- a/libsvgbird/Ellipse.vala+++ /dev/null@@ -1,75 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;-using Math;--namespace SvgBird {--public class Ellipse : Object {	--	public double cx = 0;-	public double cy = 0;-	public double rx = 0;-	public double ry = 0;-	-	public Ellipse () {-	}--	public Ellipse.create_copy (Ellipse c) {-		Object.copy_attributes (c, this);-		c.cx = cx;-		c.cx = cy;-		c.rx = rx;-		c.ry = ry;-	}-	-	public override bool is_over (double x, double y) {-		return false;-	}-			-	public override void draw_outline (Context cr) {-		cr.save ();-		cr.translate (cx, cy);-		cr.scale (rx, ry);-		cr.arc (0, 0, 1, 0, 2 * PI);-		cr.restore ();		-	}--	public override void move (double dx, double dy) {-	}-	-	public override void update_region_boundaries () {-	}--	public override void rotate (double theta, double xc, double yc) {-	}-	-	public override bool is_empty () {-		return false;-	}-	-	public override void resize (double ratio_x, double ratio_y) {-	}-	-	public override Object copy () {-		return new Ellipse.create_copy (this);-	}--	public override string to_string () {-		return "Ellipse";-	}-}--}diff --git a/libsvgbird/EmptyObject.vala b/libsvgbird/EmptyObject.valadeleted file mode 100644index fb1bc4d..0000000--- a/libsvgbird/EmptyObject.vala+++ /dev/null@@ -1,56 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;--namespace SvgBird {--public class EmptyObject : Object {--	public EmptyObject () {-	}-	-	public override bool is_over (double x, double y) {-		return false;-	}-			-	public override void draw_outline (Context cr) {-	}--	public override void move (double dx, double dy) {-	}-	-	public override void update_region_boundaries () {-	}--	public override void rotate (double theta, double xc, double yc) {-	}-	-	public override bool is_empty () {-		return false;-	}-	-	public override void resize (double ratio_x, double ratio_y) {-	}-	-	public override Object copy () {-		return new EmptyObject ();-	}--	public override string to_string () {-		return "Empty";-	}-}--}diff --git a/libsvgbird/Gradient.vala b/libsvgbird/Gradient.valadeleted file mode 100644index 50b2927..0000000--- a/libsvgbird/Gradient.vala+++ /dev/null@@ -1,79 +0,0 @@-/*-	Copyright (C) 2015 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;-using Math;--namespace SvgBird {--public class Gradient : GLib.Object {-	public double x1;-	public double y1;-	public double x2;-	public double y2;--	public Gee.ArrayList<Stop> stops;-	-	public string id = "";-	public string? href = null;-	public SvgTransforms transforms;--	public Gradient () {-		x1 = 0;-		y1 = 0;-		x2 = 0;-		y2 = 0;-		stops = new Gee.ArrayList<Stop> ();-		transforms = new SvgTransforms ();-	}-	-	public Gradient copy () {-		Gradient g = new Gradient ();-		g.x1 = x1;-		g.y1 = y1;-		g.x2 = x2;-		g.y2 = y2;-		-		foreach (Stop s in stops) {-			g.stops.add (s.copy ());-		}-		-		return g;-	}-	-	public void copy_stops (Gradient g) {-		foreach (Stop stop in g.stops) {-			stops.add (stop.copy ());-		}-	}-	-	public string to_string () {-		StringBuilder description = new StringBuilder ();-		description.append ("Gradient: ");-		description.append (@"x1=$x1, y1=$y1, x2=$x2, y2=$y2");-		-		foreach (Stop stop in stops) {-			description.append (" ");-			description.append (stop.to_string ());-		}-		-		return description.str;-	}-	-	public Matrix get_matrix () {-		return transforms.get_matrix ();-	}-}--}diff --git a/libsvgbird/Layer.vala b/libsvgbird/Layer.valadeleted file mode 100644index f8bf897..0000000--- a/libsvgbird/Layer.vala+++ /dev/null@@ -1,183 +0,0 @@-/*-	Copyright (C) 2015 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;--namespace SvgBird {--public class Layer : Object {-	public ObjectGroup objects;-	public string name = "Layer";--	public Layer () {-		objects = new ObjectGroup ();-		transforms = new SvgTransforms ();-	}--	public void draw (Context cr) {-		cr.save ();-		apply_transform (cr);-		-		if (clip_path != null) {-			ClipPath clipping = (!) clip_path;-			clipping.apply (cr);-		}--		foreach (Object object in objects) {-			cr.save ();-			object.apply_transform (cr);-						-			if (object.clip_path != null) {-				ClipPath clipping = (!) object.clip_path;-				clipping.apply (cr);-			}-			-			if (object is Layer) {-				Layer sublayer = (Layer) object;-				sublayer.draw (cr);		-			} else {-				object.draw_outline (cr);-				object.paint (cr);-			}-			cr.restore ();-		}-		-		cr.restore ();-	}--	public override void draw_outline (Context cr) {-		apply_transform (cr);-		-		foreach (Object object in objects) {-			cr.save ();-			object.apply_transform (cr);-			object.draw_outline (cr);-			cr.restore ();-		}-		-		cr.restore ();-	}--	public int index_of (Layer sublayer) {-		return objects.index_of (sublayer);-	}-		-	public void add_layer (Layer layer) {-		objects.add (layer);-	}-	-	public void add_object (Object object) {-		objects.add (object);-	}--	public void remove (Object o) {-		objects.remove (o);-	}-	-	public void remove_layer (Layer layer) {-		objects.remove (layer);-		-		foreach (Object object in objects) {-			if (object is Layer) {-				Layer sublayer = (Layer) object;-				sublayer.remove_layer (layer);-			}-		}-	}-	-	public static void copy_layer (Layer from, Layer to) {-		to.name = from.name;-		to.objects = from.objects.copy ();-	}--	public override Object copy () {-		Layer layer = new Layer ();-		copy_layer (this, layer);-		Object.copy_attributes (this, layer);-		return layer;-	}-	-	public Gee.ArrayList<Layer> get_sublayers () {-		Gee.ArrayList<Layer> sublayers = new Gee.ArrayList<Layer> ();-		-		foreach (Object object in objects) {-			if (likely (object is Layer)) {-				Layer sublayer = (Layer) object;-				sublayers.add (sublayer);-			} else {-				warning ("An object in the group " + name + " is not a layer.");-			}-		}-		-		return sublayers;-	}-		-	public void print (int indent = 0) {-		stdout.printf (@"Layer: $(name)");--		if (!visible) {-			stdout.printf (" hidden");-		}-		-		stdout.printf (@" $(transforms) $(style)");-		-		stdout.printf (@"\n");--		foreach (Object object in objects) {-			stdout.printf (@"$(object.to_string ()) $(object.transforms) $(object.style)");-			-			if (!object.visible) {-				stdout.printf (" hidden");-			}-			-			stdout.printf ("\n");--			for (int i = 0; i < indent; i++) {-				stdout.printf ("\t");-			}--			if (object is Layer) {-				Layer sublayer = (Layer) object;-				sublayer.print (indent + 1);-			}-		}-	}---	public override bool is_over (double x, double y) {-		return false;-	}-		-	public override void move (double dx, double dy) {-	}-	-	public override void update_region_boundaries () {-	}--	public override void rotate (double theta, double xc, double yc) {-	}-	-	public override bool is_empty () {-		return false;-	}-	-	public override void resize (double ratio_x, double ratio_y) {-	}-	-	public override string to_string () {-		return "Layer: " + name;-	}-}--}diff --git a/libsvgbird/Line.vala b/libsvgbird/Line.valadeleted file mode 100644index fecc979..0000000--- a/libsvgbird/Line.vala+++ /dev/null@@ -1,72 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;--namespace SvgBird {--public class Line : Object {	--	public double x1 = 0;-	public double y1 = 0;-	public double x2 = 0;-	public double y2 = 0;-	-	public Line () {-	}--	public Line.create_copy (Line c) {-		Object.copy_attributes (c, this);-		c.x1 = x1;-		c.y1 = y1;-		c.x2 = x2;-		c.y2 = y2;-	}-	-	public override bool is_over (double x, double y) {-		return false;-	}-			-	public override void draw_outline (Context cr) {-		cr.move_to (x1, y1);-		cr.line_to (x1, y1);-		cr.line_to (x2, y2);-	}--	public override void move (double dx, double dy) {-	}-	-	public override void update_region_boundaries () {-	}--	public override void rotate (double theta, double xc, double yc) {-	}-	-	public override bool is_empty () {-		return false;-	}-	-	public override void resize (double ratio_x, double ratio_y) {-	}-	-	public override Object copy () {-		return new Line.create_copy (this);-	}--	public override string to_string () {-		return "Line";-	}-}--}diff --git a/libsvgbird/LineCap.vala b/libsvgbird/LineCap.valadeleted file mode 100644index 45b673f..0000000--- a/libsvgbird/LineCap.vala+++ /dev/null@@ -1,23 +0,0 @@-/*-	Copyright (C) 2015 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--namespace SvgBird {--public enum LineCap {-	BUTT,-	SQUARE,-	ROUND-}--}diff --git a/libsvgbird/Object.vala b/libsvgbird/Object.valadeleted file mode 100644index 93a3293..0000000--- a/libsvgbird/Object.vala+++ /dev/null@@ -1,158 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;-using Math;--namespace SvgBird {--public abstract class Object : GLib.Object {-	bool open = false;-	-	public bool visible = true;-	public SvgStyle style = new SvgStyle ();-	public SvgTransforms transforms = new SvgTransforms ();-	public ClipPath? clip_path = null;-	public string id = "";-	public string css_class = "";-	-	public virtual Color? color { get; set; } // FIXME: keep this in svg style-	public virtual Color? stroke_color { get; set; }-	public virtual Gradient? gradient { get; set; }--	/** Path boundaries */-	public virtual double xmax { get; set; }-	public virtual double xmin { get; set; }-	public virtual double ymax { get; set; }-	public virtual double ymin { get; set; }-	-	public virtual double rotation { get; set; }-	public virtual double stroke { get; set; }-	public virtual LineCap line_cap { get; set; default = LineCap.BUTT; }-	public virtual bool fill { get; set; }-		-	public Object () {	-	}--	public Object.create_copy (Object o) {	-		open = o.open;-	}-		-	public void set_open (bool open) {-		this.open = open;-	}-	-	public bool is_open () {-		return open;-	}--	public abstract void update_region_boundaries ();-	public abstract bool is_over (double x, double y);-	public abstract void draw_outline (Context cr);--	public abstract Object copy ();-	public abstract void move (double dx, double dy);-	public abstract void rotate (double theta, double xc, double yc);-	public abstract bool is_empty ();-	public abstract void resize (double ratio_x, double ratio_y);--	public static void copy_attributes (Object from, Object to) {-		to.open = from.open;--		to.color = from.color;-		to.stroke_color = from.stroke_color;-		to.gradient = from.gradient;-		-		to.xmax = from.xmax;-		to.xmin = from.xmin;-		to.ymax = from.ymax;-		to.ymin = from.ymin;-		-		to.rotation = from.rotation;-		to.stroke = from.stroke;-		to.line_cap = from.line_cap;-		to.fill = from.fill;	-	}-	-	public virtual string to_string () {-		return "Object";-	}--	public void paint (Context cr) {-		Color fill, stroke;-		bool need_fill = style.fill_gradient != null || style.fill != null;-		bool need_stroke = style.stroke_gradient != null || style.stroke != null;--		cr.set_line_width (style.stroke_width);-		-		if (style.fill_gradient != null) {-			apply_gradient (cr, (!) style.fill_gradient);-		} else if (style.fill != null) {-			fill = (!) style.fill;-			cr.set_source_rgba (fill.r, fill.g, fill.b, fill.a);-		}--		if (need_fill) {-			if (need_stroke) {-				cr.fill_preserve ();-			} else {-				cr.fill ();-			}	-		}--		if (style.stroke_gradient != null) {-			apply_gradient (cr, (!) style.stroke_gradient);-		} else if (style.stroke != null) {-			stroke = (!) style.stroke;-			cr.set_source_rgba (stroke.r, stroke.g, stroke.b, stroke.a);-		}--		if (need_stroke) {-			cr.stroke ();-		}-	}-	-	public void apply_gradient (Context cr, Gradient? gradient) {-		Cairo.Pattern pattern;-		Gradient g;-		-		if (gradient != null) {-			g = (!) gradient;-			-			pattern = new Cairo.Pattern.linear (g.x1, g.y1, g.x2, g.y2);--			Matrix gradient_matrix = g.get_matrix ();-			gradient_matrix.invert ();-			pattern.set_matrix (gradient_matrix);-			-			foreach (Stop s in g.stops) {-				Color c = s.color;-				pattern.add_color_stop_rgba (s.offset, c.r, c.g, c.b, c.a);-			}-					-			cr.set_source (pattern);-		}-	}-	-	public void apply_transform (Context cr) {-		Matrix view_matrix = cr.get_matrix ();-		Matrix object_matrix = transforms.get_matrix ();-		-		object_matrix.multiply (object_matrix, view_matrix);-		cr.set_matrix (object_matrix);-	}-					-}--}diff --git a/libsvgbird/ObjectGroup.vala b/libsvgbird/ObjectGroup.valadeleted file mode 100644index 259d04c..0000000--- a/libsvgbird/ObjectGroup.vala+++ /dev/null@@ -1,76 +0,0 @@-/*-	Copyright (C) 2015 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--namespace SvgBird {--public class ObjectGroup : GLib.Object {-	public Gee.ArrayList<Object> objects;-	-	public int size { -		get {-			return objects.size;-		}-	}-	-	public ObjectGroup () {-		 objects = new Gee.ArrayList<Object> ();-	}--	public Object get_object (int index) {-		if (unlikely (index < 0 || index >= size)) {-			warning ("Index out of bounds.");-			return new EmptyObject ();-		}-		-		return objects.get (index);-	}--	public int index_of (Object o) {-		return objects.index_of (o);-	}--	public Gee.Iterator<Object> iterator () {-		return objects.iterator ();-	}--	public void remove (Object p) {-		objects.remove (p);-	}-	-	public void add (Object p) {-		objects.add (p);-	}-	-	public void clear () {-		objects.clear ();-	}--	public void append (ObjectGroup group) {-		foreach (Object o in group.objects) {-			objects.add (o);-		}-	}-	-	public ObjectGroup copy () {-		ObjectGroup objects_copy = new ObjectGroup ();-		-		foreach (Object o in objects) {-			objects_copy.add (o.copy ());-		}-		-		return objects_copy;-	}-}--}diff --git a/libsvgbird/PointValue.vala b/libsvgbird/PointValue.valadeleted file mode 100644index 6c93beb..0000000--- a/libsvgbird/PointValue.vala+++ /dev/null@@ -1,28 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--namespace SvgBird {--[CCode (cheader_filename="point_value.h")]-public extern struct PointValue {-    uchar type;-    double value;-}--public static const uchar POINT_NONE = 0;-public static const uchar POINT_ARC = 1;-public static const uchar POINT_CUBIC = 2;-public static const uchar POINT_LINE = 3;--}diff --git a/libsvgbird/Points.vala b/libsvgbird/Points.valadeleted file mode 100644index 4971eec..0000000--- a/libsvgbird/Points.vala+++ /dev/null@@ -1,40 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;--namespace SvgBird {--public class Points : GLib.Object {-	public Doubles point_data = new Doubles.for_capacity (100);-	public double x = 0;-	public double y = 0;-	public bool closed = false;-	public int size {-		get {-			return point_data.size;-		}-	}-	-	public void add (double p) {-		point_data.add (p);-	}-	-	public void add_type (uchar type) {-		point_data.add_type (type);-	}-}--}-diff --git a/libsvgbird/Polygon.vala b/libsvgbird/Polygon.valadeleted file mode 100644index c7c38fc..0000000--- a/libsvgbird/Polygon.vala+++ /dev/null@@ -1,71 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;-using Math;--namespace SvgBird {--public class Polygon : Object {--	public Doubles points = new Doubles ();--	public Polygon () {-	}-	-	public override bool is_over (double x, double y) {-		return false;-	}-	-	public override void draw_outline (Context cr) {-		if (points.size > 2) {-			cr.move_to (points.data[0].value, points.data[1].value);-			-			for (int i = 2; i < points.size - 1; i += 2) {-				cr.line_to (points.data[i].value, points.data[i + 1].value);-			}-			-			cr.close_path ();-		}		-	}-	-	public override void move (double dx, double dy) {-	}-	-	public override void update_region_boundaries () {-	}--	public override void rotate (double theta, double xc, double yc) {-	}-	-	public override bool is_empty () {-		return false;-	}-	-	public override void resize (double ratio_x, double ratio_y) {-	}-	-	public override Object copy () {-		Polygon p = new Polygon ();		-		p.points = points.copy ();-		Object.copy_attributes (this, p);-		return p;-	}--	public override string to_string () {-		return "Polygon";-	}-}--}diff --git a/libsvgbird/Polyline.vala b/libsvgbird/Polyline.valadeleted file mode 100644index 4128b6e..0000000--- a/libsvgbird/Polyline.vala+++ /dev/null@@ -1,69 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;-using Math;--namespace SvgBird {--public class Polyline : Object {--	public Doubles points = new Doubles ();--	public Polyline () {-	}-	-	public override bool is_over (double x, double y) {-		return false;-	}-			-	public override void draw_outline (Context cr) {-		if (points.size > 2) {-			cr.move_to (points.data[0].value, points.data[1].value);-			-			for (int i = 2; i < points.size - 1; i += 2) {-				cr.line_to (points.data[i].value, points.data[i + 1].value);-			}-		}-	}-	-	public override void move (double dx, double dy) {-	}-	-	public override void update_region_boundaries () {-	}--	public override void rotate (double theta, double xc, double yc) {-	}-	-	public override bool is_empty () {-		return false;-	}-	-	public override void resize (double ratio_x, double ratio_y) {-	}-	-	public override Object copy () {-		Polyline p = new Polyline ();		-		p.points = points.copy ();-		Object.copy_attributes (this, p);-		return p;-	}--	public override string to_string () {-		return "Polyline";-	}-}--}diff --git a/libsvgbird/Rectangle.vala b/libsvgbird/Rectangle.valadeleted file mode 100644index 874f762..0000000--- a/libsvgbird/Rectangle.vala+++ /dev/null@@ -1,97 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;-using Math;--namespace SvgBird {--public class Rectangle : Object {--	public double x = 0;-	public double y = 0;-	public double width = 0;-	public double height = 0;-	public double rx = 0;-	public double ry = 0;--	public Rectangle () {-	}-	-	public override bool is_over (double x, double y) {-		return false;-	}-			-	public override void draw_outline (Context cr) {-		if (rx == 0 && ry == 0) {-			cr.rectangle (x, y, width, height);-		} else {-			draw_rounded_corners (cr);-		}-	}-	-	public void draw_rounded_corners (Context cr) {-		cr.new_path ();-		elliptical_arc (cr, x + width - rx, y + ry, -PI / 2, 0);-		elliptical_arc (cr, x + width - rx, y + height - ry, 0, PI / 2);-		elliptical_arc (cr, x + rx, y + height - ry, PI / 2, PI);-		elliptical_arc (cr, x + rx, y + ry, PI, PI + PI / 2);-		cr.close_path ();-	}-	-	public void elliptical_arc (Context cr, double x, double y, double angle_start, double angle_stop) {-		cr.save ();-		cr.translate (x + rx, y + ry);-		cr.scale (rx, ry);-		cr.arc (0, 0, 1, angle_start, angle_stop);-		cr.restore ();-	}-	-	public override void move (double dx, double dy) {-		x += dx;-		y += dy;-	}-	-	public override void update_region_boundaries () {-	}--	public override void rotate (double theta, double xc, double yc) {-	}-	-	public override bool is_empty () {-		return false;-	}-	-	public override void resize (double ratio_x, double ratio_y) {-	}-	-	public override Object copy () {-		Rectangle r = new Rectangle ();-		-		r.x = x;-		r.y = y;-		r.width = width;-		r.height = height;-		-		Object.copy_attributes (this, r);-		-		return r;-	}--	public override string to_string () {-		return "Rectangle";-	}-}--}diff --git a/libsvgbird/Selector.vala b/libsvgbird/Selector.valadeleted file mode 100644index 2d7f741..0000000--- a/libsvgbird/Selector.vala+++ /dev/null@@ -1,72 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using B;-using Math;--namespace SvgBird {--public class Selector : GLib.Object {-	-	Gee.ArrayList<SelectorPattern> patterns = new Gee.ArrayList<SelectorPattern> ();-	public SvgStyle style { get; set; }--	public Selector (string pattern, SvgStyle style) {-		string[] selector_patterns = pattern.split (",");-		-		for (int i = 0; i < selector_patterns.length; i++) {-			patterns.add (new SelectorPattern (selector_patterns[i]));-		}--		this.style = style;-	}-	-	public Selector.copy_constructor (Selector selector) {-		style = selector.style.copy ();-		-		foreach (SelectorPattern pattern in selector.patterns) {-			patterns.add (pattern.copy ());-		}-	}-	-	public string to_string () {-		StringBuilder s = new StringBuilder ();-		-		foreach (SelectorPattern pattern in patterns) {-			if (s.str != "") {-				s.append (", ");-			}-			-			s.append (pattern.to_string ());-		}-		-		return s.str;-	}-	-	public Selector copy () {-		return new Selector.copy_constructor (this);-	}-	-	public bool match (XmlElement tag, string? id, string? css_class) {-		foreach (SelectorPattern pattern in patterns) {-			if (pattern.match (tag, id, css_class)) {-				return true;-			}-		}-		-		return false;-	}-}--}diff --git a/libsvgbird/SelectorPattern.vala b/libsvgbird/SelectorPattern.valadeleted file mode 100644index c58f681..0000000--- a/libsvgbird/SelectorPattern.vala+++ /dev/null@@ -1,135 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using B;-using Math;--namespace SvgBird {--/** A CSS selector pattern. */-public class SelectorPattern : GLib.Object {-	Gee.ArrayList<SelectorTag> tags = new Gee.ArrayList<SelectorTag> ();--	public SelectorPattern.empty () {-	}--	public SelectorPattern (string pattern) {-		string p = pattern.strip ();-		string[] elements = p.split (" ");--		foreach (string element in elements) {-			if (element != "") {-				tags.add (new SelectorTag (element));-			}-		}-	}--	public string to_string () {-		StringBuilder s = new StringBuilder ();-		-		foreach (SelectorTag tag in tags) {-			if (s.str != "") {-				s.append (" ");-			}-			-			s.append (tag.to_string ());-		}-		-		return s.str;-	}	-	public SelectorPattern copy () {-		SelectorPattern pattern = new SelectorPattern.empty ();-		-		foreach (SelectorTag tag in tags) {-			pattern.tags.add (tag.copy ());-		}-		-		return pattern;-	}-	-	public bool match (XmlElement tag, string? id, string? css_class) {-		for (int i = tags.size - 1; i >= 0; i--) {-			SelectorTag pattern = tags.get (i);-						-			if (pattern.name == ">") {-				if (i - 1 < 0) {-					return false;-				}-				-				string parent = tags.get (i - 1).name;-				-				if (!has_parent (tag, parent)) {-					return false;-				}-			} else if (pattern.name == "+") {-				if (i - 1 < 0) {-					return false;-				}-				-				string previous = tags.get (i - 1).name;-				-				if (!is_immediately_following (tag, previous)) {-					return false;-				}-			} else if (!pattern.match (tag, id, css_class)) {-				return false;-			}-		}-		-		return true;-	}-	-	public bool is_immediately_following (XmlElement tag, string previous) {-		return get_previous (tag) == tag;-	}-	-	XmlElement? get_previous (XmlElement? xml_parent) {-		if (xml_parent == null) {-			return null;-		}-		-		XmlElement element = (!) xml_parent;-		XmlElement? parent = element.get_parent ();-		-		if (parent != null) {-			XmlElement? previous = null;-			-			foreach (XmlElement e in (!) parent) {-				if (e == xml_parent) {-					return previous;-				}-				-				previous = e;-			}-		}-		-		return null;-	}-	-	public bool has_parent (XmlElement tag, string parent) {-		XmlElement? xml_parent = tag.get_parent ();-		-		while (xml_parent != null) {-			if (((!) xml_parent).get_name () == parent) {-				return true;-			}-			-			xml_parent = tag.get_parent ();-		}-		-		return false;-	}-}--}diff --git a/libsvgbird/SelectorTag.vala b/libsvgbird/SelectorTag.valadeleted file mode 100644index a9cc530..0000000--- a/libsvgbird/SelectorTag.vala+++ /dev/null@@ -1,200 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using B;-using Math;--namespace SvgBird {--/** A part of a CSS selector pattern. */-public class SelectorTag : GLib.Object {-	public string name;-	string? id = null;-	string? css_class = null;-	Gee.ArrayList<AttributePattern>? attribute_patterns = null;--	public SelectorTag.empty () {-	}-	-	public SelectorTag (string pattern) {-		string tag_pattern = pattern.strip ();-		int id_separator = tag_pattern.index_of ("#");-		int class_separator = tag_pattern.index_of (".");-		int attribute_separator = tag_pattern.index_of ("[");--		if (attribute_separator != -1) {-			parse_attributes (tag_pattern.substring (attribute_separator));-		}-				-		if (id_separator != -1) {-			name = tag_pattern.substring (0, id_separator);-			-			id_separator += "#".length;-			if (attribute_separator == -1) {-				id = tag_pattern.substring (id_separator);-			} else {-				id = tag_pattern.substring (id_separator, attribute_separator - id_separator);-			}-		} else if (class_separator != -1) {-			name = tag_pattern.substring (0, class_separator);-			-			class_separator += ".".length;-			if (attribute_separator == -1) {-				css_class = tag_pattern.substring (class_separator);-			} else {-				css_class = tag_pattern.substring (class_separator, attribute_separator - class_separator);-			}-		} else {-			if (attribute_separator == -1) {-				name = tag_pattern;-			} else {-				css_class = tag_pattern.substring (0, attribute_separator);-			}-		}-	}-	-	public SelectorTag copy () {-		SelectorTag tag = new SelectorTag.empty();-		-		tag.name = name;-		tag.id = id;-		tag.css_class = css_class;-		-		if (attribute_patterns != null) { -			foreach (AttributePattern p in (!) attribute_patterns) {-				((!) attribute_patterns).add (p.copy ());-			}-		}-		-		return tag;-	}-	-	void parse_attributes (string attributes) {-		int index = 0;-		Gee.ArrayList<AttributePattern> patterns = new Gee.ArrayList<AttributePattern> ();-		-		while (index != -1) {-			int start = attributes.index_of ("[", index);-			-			if (start == -1) {-				return;-			}-			-			int stop = attributes.index_of ("]", start);-			-			if (stop == -1) {-				return;-			}-			-			AttributePattern pattern;-			pattern = parse_attribute (attributes.substring (start, stop));-			patterns.add (pattern);-			-			index = stop + "]".length;-		}-		-		attribute_patterns = patterns;-	}-	-	AttributePattern parse_attribute (string attribute) {-		int starts_with = attribute.index_of ("|=");-		int in_list = attribute.index_of ("~=");-		int equals = attribute.index_of ("=");-		AttributePattern pattern = new AttributePattern ();--		if (starts_with != -1) {-			pattern.name = attribute.substring (0, starts_with);-			pattern.type = AttributePatternType.STARTS_WITH;-			pattern.content = attribute.substring (0, equals + "~=".length);-		} else if (in_list != -1) {-			pattern.name = attribute.substring (0, in_list);-			pattern.type = AttributePatternType.LIST;-			pattern.content = attribute.substring (0, equals + "~=".length);-		} else if (equals != -1) {-			pattern.name = attribute.substring (0, equals);-			pattern.type = AttributePatternType.EQUALS;-			pattern.content = attribute.substring (0, equals + "=".length);-		} else {-			pattern.name = attribute;-			pattern.type = AttributePatternType.ANYTHING;-		}-		-		return pattern;-	}--	public bool match (XmlElement tag, string? id, string? css_class) {-		string tag_name = tag.get_name ();-		-		if (this.name != "*" && this.name != "" && tag_name != "") {-			if (this.name != tag_name) {-				return false;-			}-		}-		-		if (this.id != null) {-			if (id == null) {-				return false;-			} --			if (((!) this.id) != ((!) id)) {-				return false;-			}-		}-		-		if (this.css_class != null) {-			if (css_class == null) {-				return false;-			} -			-			if (((!) this.css_class) != ((!) css_class)) {-				return false;-			}-		}-		-		if (attribute_patterns != null) {-			foreach (AttributePattern pattern in (!) attribute_patterns) {-				if (!pattern.match (tag.get_attributes ())) {-					return false;-				}-			}-		}-		-		return true;-	}--	public string to_string () {-		StringBuilder s = new StringBuilder ();-		s.append ((!) name);-		-		if (id != null) {-			s.append ("#");-			s.append ((!) id);-		}--		if (css_class != null) {-			s.append (".");-			s.append ((!) css_class);-		}-		-		if (attribute_patterns != null) {-			foreach (AttributePattern a in (!) attribute_patterns) {-				s.append (a.to_string ());-			}-		}-		-		return s.str;-	}-}--}diff --git a/libsvgbird/Stop.vala b/libsvgbird/Stop.valadeleted file mode 100644index 8da338a..0000000--- a/libsvgbird/Stop.vala+++ /dev/null@@ -1,39 +0,0 @@-/*-	Copyright (C) 2015 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;-using Math;--namespace SvgBird {--public class Stop : GLib.Object {-	public Color color = new Color (0, 0, 0, 1);-	public double offset = 0;-	-	public Stop () {-	}-	-	public Stop copy () {-		Stop s = new Stop ();-		s.color = color.copy  ();-		s.offset = offset;-		return s;-	}-	-	public string to_string () {-		return @"Stop: $(offset), " + color.to_string ();-	}-}--}diff --git a/libsvgbird/StyleSheet.vala b/libsvgbird/StyleSheet.valadeleted file mode 100644index 0efc6e7..0000000--- a/libsvgbird/StyleSheet.vala+++ /dev/null@@ -1,160 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using B;-using Math;--namespace SvgBird {---public class StyleSheet : GLib.Object {-	-	public Gee.ArrayList<Selector> styles = new Gee.ArrayList<Selector> ();-	-	public StyleSheet () {-	}-	-	/** Copy references to all selectors in this style sheet. */-	public StyleSheet shallow_copy () {-		StyleSheet style_sheet = new StyleSheet ();-		-		foreach (Selector selector in styles) {-			style_sheet.styles.add (selector);-		}-		-		return style_sheet;-	}--	public StyleSheet copy () {-		StyleSheet style_sheet = new StyleSheet ();-		-		foreach (Selector selector in styles) {-			style_sheet.styles.add (selector.copy ());-		}-		-		return style_sheet;-	}-	-	public void apply_style (XmlElement tag, SvgStyle style) {-		string? id = null;-		string? css_class = null;-		-		foreach (Attribute attribute in tag.get_attributes ()) {-			string name = attribute.get_name ();-			-			if (name == "id") {-				id = attribute.get_content ();-			} else if (name == "class") {-				css_class = attribute.get_content ();-			}-		}-		-		foreach (Selector selector in styles) {-			if (selector.match (tag, id, css_class)) {-				style.apply (selector.style);-			}-		}-	}-	-	public void merge (StyleSheet style_sheet) {-		foreach (Selector selector in style_sheet.styles) {-			styles.add (selector.copy ());-		}-	}-	-	public static StyleSheet parse (Defs defs, XmlElement style_tag) {-		StyleSheet style_sheet = new StyleSheet ();-		string css = style_tag.get_content ();-		css = get_cdata (css);-		css = add_separators (css);-		css = replace_whitespace (css);-		-		int index = 0;-		int start_bracket_length = "{".length;-		int end_bracket_length = "}".length;-		int css_length = css.length;-		-		while (index < css_length) {-			int style_rules_start = css.index_of ("{", index);-			int style_rules_end = css.index_of ("}", style_rules_start);-			-			if (style_rules_start == -1 || style_rules_end == -1) {-				break;-			}-			-			int selector_end = style_rules_start - start_bracket_length;-			string selectors = css.substring (index, selector_end - index);-			-			int style_start = style_rules_start + start_bracket_length;-			int style_end = style_rules_end;-			string style_rules = css.substring (style_start, style_end - style_start);-			-			index = style_rules_end + end_bracket_length;-			SvgStyle style = new SvgStyle.for_properties (defs, style_rules);-			-			Selector selector = new Selector (selectors, style);-			style_sheet.styles.add (selector);-		}-		-		return style_sheet;-	}-	-	public static string get_cdata (string tag_content) {-		StringBuilder data = new StringBuilder ();-		-		int index = 0;-		int cdata_tag_length = "<![CDATA[".length;-		int cdata_end_tag_length = "]]>".length;-		int content_length = tag_content.length;-		-		while (index < content_length) {-			int cdata_start = tag_content.index_of ("<![CDATA[", index);-			int cdata_end = tag_content.index_of ("]]>", cdata_start);-			-			if (cdata_start == -1 || cdata_end == -1) {-				break;-			}-			-			cdata_start += cdata_tag_length;-			data.append (tag_content.substring (cdata_start, cdata_end - cdata_start));-			index = cdata_end + cdata_end_tag_length;-		}-		-		if (index < tag_content.length) {-			data.append (tag_content.substring (index));-		}-		-		return data.str;-	}--	public static string add_separators (string data) {-		string style_data = data.replace (">", " > ");-		style_data = data.replace ("+", " + ");-		return style_data;-	}-	-	public static string replace_whitespace (string data) {-		string style_data = data.replace ("\n", " ");-		style_data = style_data.replace ("\r", " ");-		style_data = style_data.replace ("\t", " ");-		-		while (style_data.index_of ("  ") != -1) {-			style_data = style_data.replace ("  ", " ");-		}-		-		return style_data;-	}-}--}diff --git a/libsvgbird/SvgArc.vala b/libsvgbird/SvgArc.valadeleted file mode 100644index 35cfe63..0000000--- a/libsvgbird/SvgArc.vala+++ /dev/null@@ -1,154 +0,0 @@-/*- * BirdFont code from SVG Salamander- * - * Copyright (c) 2004, Mark McKay- * Copyright (c) 2014, Johan Mattsson- * All rights reserved.- *- * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following- * conditions are met:- *- *   - Redistributions of source code must retain the above - *     copyright notice, this list of conditions and the following- *     disclaimer.- *   - Redistributions in binary form must reproduce the above- *     copyright notice, this list of conditions and the following- *     disclaimer in the documentation and/or other materials - *     provided with the distribution.- *- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED- * OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Mark McKay can be contacted at mark@kitfox.com.  Salamander and other- * projects can be found at http://www.kitfox.com- *- * Created on January 26, 2004, 8:40 PM- * Adapded to BirdFont on Juli 2, 2014, 5:01 PM- */--using Math;--namespace SvgBird {--public static void get_arc_arguments (double x0, double y0,-	double rx, double ry, double angle, bool largeArcFlag,-	bool sweepFlag, double x, double y,-	out double angle_start, out double angle_extent,-	out double center_x, out double center_y) {--	//-	// Elliptical arc implementation based on the SVG specification notes-	//--	double cx, cy;-	double dx2, dy2, cosAngle, sinAngle;-	double x1, y1, Prx, Pry, Px1, Py1, radiiCheck;-	double sign, sq, coef, cx1, cy1;-	double sx2, sy2;-	double ux, uy, vx, vy, p, n;-	double angleStart, angleExtent;-	-	// Compute the half distance between the current and the final point-	dx2 = (x0 - x) / 2.0;-	dy2 = (y0 - y) / 2.0;-	-	// Convert angle from degrees to radians-	angle = angle % (2 * Math.PI);-	-	cosAngle = cos (angle);-	sinAngle = sin (angle);--	//-	// Step 1 : Compute (x1, y1)-	//-	x1 = cosAngle * dx2 + sinAngle * dy2;-	y1 = -sinAngle * dx2 + cosAngle * dy2;--	// Ensure radii are large enough-	rx = fabs(rx);-	ry = fabs(ry);-	Prx = rx * rx;-	Pry = ry * ry;-	Px1 = x1 * x1;-	Py1 = y1 * y1;--	// Check that radii are large enough-	radiiCheck = Px1 / Prx + Py1 / Pry;-	-	if (radiiCheck > 1) {-		rx = sqrt (radiiCheck) * rx;-		ry = sqrt (radiiCheck) * ry;-		Prx = rx * rx;-		Pry = ry * ry;-	}--	//-	// Step 2 : Compute (cx1, cy1)-	//-	sign = (largeArcFlag == sweepFlag) ? -1 : 1;-	sq = ((Prx * Pry) - (Prx * Py1) - (Pry * Px1)) / ((Prx * Py1) + (Pry * Px1));-	sq = (sq < 0) ? 0 : sq;-	coef = (sign * Math.sqrt(sq));-	cx1 = coef * ((rx * y1) / ry);-	cy1 = coef * -((ry * x1) / rx);--	//-	// Step 3 : Compute (cx, cy) from (cx1, cy1)-	//-	-	sx2 = (x0 + x) / 2.0;-	sy2 = (y0 + y) / 2.0;-	cx = sx2 + (cosAngle * cx1 - sinAngle * cy1);-	cy = sy2 + (sinAngle * cx1 + cosAngle * cy1);--	//-	// Step 4 : Compute the angleStart (angle1) and the angleExtent (dangle)-	//--	ux = (x1 - cx1) / rx;-	uy = (y1 - cy1) / ry;-	vx = (-x1 - cx1) / rx;-	vy = (-y1 - cy1) / ry;--	// Compute the angle start-	n = sqrt((ux * ux) + (uy * uy));-	p = ux; // (1 * ux) + (0 * uy)-	sign = (uy < 0) ? -1d : 1d;-	angleStart = sign * acos(p / n);--	// Compute the angle extent-	n = Math.sqrt((ux * ux + uy * uy) * (vx * vx + vy * vy));-	p = ux * vx + uy * vy;-	sign = (ux * vy - uy * vx < 0) ? -1d : 1d;-	angleExtent = sign * Math.acos(p / n);-	-	if(!sweepFlag && angleExtent > 0) {-		angleExtent -= 2 * PI;-	} else if (sweepFlag && angleExtent < 0) {-		angleExtent += 2 * PI;-	}--	center_x = cx;-	center_y = cy;-		-	angleExtent = -angleExtent;-	angleStart = -angleStart;--	angle_start = angleStart;-	angle_extent = angleExtent;-}---}-diff --git a/libsvgbird/SvgDrawing.vala b/libsvgbird/SvgDrawing.valadeleted file mode 100644index 3301e70..0000000--- a/libsvgbird/SvgDrawing.vala+++ /dev/null@@ -1,90 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/---using B;-using Cairo;-using Math;--namespace SvgBird {--public class SvgDrawing : Object {-	public Layer root_layer = new Layer ();-	public Defs defs = new Defs ();--	public double x = 0;-	public double y = 0;-	-	public double width {-		get {			-			return svg_width;-		}-		-		set {-			svg_width = value;-		}-	}-	public double svg_width = 0;-	-	-	public double height = 0;-		-	public override void update_region_boundaries () {-	}-	-	public override bool is_over (double x, double y) {-		return (this.x <= x <= this.x + width) -			&& (this.y <= y <= this.y + height);-	}--	public void draw (Context cr) {-		root_layer.draw (cr);-	}-		-	public override void draw_outline (Context cr) {-		root_layer.draw_outline (cr);-	}-	-	public override Object copy () {-		SvgDrawing drawing = new SvgDrawing ();-		drawing.root_layer = (Layer) root_layer.copy ();-		drawing.defs = defs.copy ();-		drawing.x = x;-		drawing.y = y;-		drawing.width = width;-		drawing.height = height;-		return drawing;-	}-	-	public override void move (double dx, double dy) {-		x += dx;-		y += dy;-	}-	-	public override void rotate (double theta, double xc, double yc) {-	}-	-	public override bool is_empty () {-		return false;-	}-	-	public override void resize (double ratio_x, double ratio_y) {-	}--	public override string to_string () {-		return @"SvgDrawing x: $x, y: $y, width: $width, height: $height";-	}-}--}diff --git a/libsvgbird/SvgFile.vala b/libsvgbird/SvgFile.valadeleted file mode 100644index 9cb8c36..0000000--- a/libsvgbird/SvgFile.vala+++ /dev/null@@ -1,1360 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using B;-using Cairo;-using Math;--namespace SvgBird {--public class SvgFile : GLib.Object {--	SvgDrawing drawing;--	public SvgFile () {		-	}-	-	public SvgDrawing parse_svg_data (string xml_data) {-		XmlTree tree = new XmlTree (xml_data);-		return parse_svg_file (tree.get_root ());-	}-	-	public SvgDrawing parse_svg_file (XmlElement svg_tag) {-		drawing = new SvgDrawing ();--		SvgStyle style = new SvgStyle ();-		SvgStyle.parse (drawing.defs, style, svg_tag);--		foreach (Attribute attr in svg_tag.get_attributes ()) {	-			if (attr.get_name () == "width") {-				drawing.width = parse_number (attr.get_content ());-			}--			if (attr.get_name () == "height") {-				drawing.height = parse_number (attr.get_content ());-			}-		}-				-		foreach (XmlElement t in svg_tag) {-			string name = t.get_name ();--			if (name == "g") {-				parse_layer (drawing.root_layer, style, t);-			}--			if (name == "defs") {-				parse_defs (drawing, t);-			}-			-			if (name == "a") {-				parse_link (drawing.root_layer, style, svg_tag);-			}-			-			parse_object (drawing.root_layer, style, t);-		}--		set_object_properties (drawing, new SvgStyle (), svg_tag);-		-		return drawing;-	}--	private void parse_layer (Layer layer, SvgStyle parent_style, XmlElement tag) {		-		foreach (XmlElement t in tag) {-			string name = t.get_name ();--			if (name == "g") {-				Layer sublayer = new Layer ();-				parse_layer (layer, parent_style, t);-				layer.objects.add (sublayer);-			}--			if (name == "a") {-				parse_link (layer, parent_style, t);-			}-			-			parse_object (layer, parent_style, t);-		}--		set_object_properties (layer, parent_style, tag);-	}--	void parse_clip_path (SvgDrawing drawing, XmlElement tag) {-		ClipPath clip_path;-		-		Layer layer = new Layer ();-		parse_layer (layer, new SvgStyle (), tag);-		clip_path = new ClipPath (layer);-		-		drawing.defs.clip_paths.add (clip_path);-	}--	void parse_defs (SvgDrawing drawing, XmlElement tag) {-		foreach (XmlElement t in tag) {-			// FIXME: radial-			string name = t.get_name ();-			-			if (name == "linearGradient") {-				parse_linear_gradient (drawing, t);-			} else if (name == "clipPath") {-				parse_clip_path (drawing, t);-			}-		}-		-		foreach (Gradient gradient in drawing.defs.gradients) {-			if (gradient.href != null) {-				Gradient? referenced;-				referenced = drawing.defs.get_gradient_for_id ((!) gradient.href);-				-				if (referenced != null) {-					gradient.copy_stops ((!) referenced);-				}-				-				gradient.href = null;-			}-		}-		-		foreach (XmlElement t in tag) {-			// FIXME: radial-			string name = t.get_name ();-			-			if (name == "style") {-				drawing.defs.style_sheet = StyleSheet.parse (drawing.defs, t);-			}-		}-		-	}--	void parse_linear_gradient (SvgDrawing drawing, XmlElement tag) {-		Gradient gradient = new Gradient ();-		-		drawing.defs.add (gradient);-		-		foreach (Attribute attr in tag.get_attributes ()) {-			string name = attr.get_name ();-			-			// FIXME: gradientUnits-			-			if (name == "gradientTransform") {-				gradient.transforms = parse_transform (attr.get_content ());-			}--			if (name == "href") {-				gradient.href = attr.get_content ();-			}--			if (name == "x1") {-				gradient.x1 = parse_number (attr.get_content ());-			}--			if (name == "y1") {	-				gradient.y1 = parse_number (attr.get_content ());-			}-			-			if (name == "x2") {-				gradient.x2 = parse_number (attr.get_content ());-			}--			if (name == "y2") {-				gradient.y2 = parse_number (attr.get_content ());-			}--			if (name == "id") {-				gradient.id = attr.get_content ();-			}-		}-		-		foreach (XmlElement t in tag) {-			// FIXME: radial-			string name = t.get_name ();-			-			if (name == "stop") {-				parse_stop (gradient, t);-			}-		}-	}--	void parse_stop (Gradient gradient, XmlElement tag) {-		SvgStyle parent_style = new SvgStyle (); // not inherited-		SvgStyle style = SvgStyle.parse (drawing.defs, parent_style, tag);-		Stop stop = new Stop ();-		-		gradient.stops.add (stop);-		-		foreach (Attribute attr in tag.get_attributes ()) {-			string name = attr.get_name ();-			-			if (name == "offset") {-				string stop_offset = attr.get_content ();-				-				if (stop_offset.index_of ("%") > -1) {-					stop_offset = stop_offset.replace ("%", "");-					stop.offset = parse_number (stop_offset) / 100.0;-				} else {-					stop.offset = parse_number (stop_offset);-				}-			}-		}-		-		string? stop_color = style.style.get ("stop-color");-		string? stop_opacity = style.style.get ("stop-opacity");-		Color? color = new Color (0, 0, 0, 1);-		-		if (stop_color != null) {-			color = Color.parse (stop_color);-			-			if (color != null) {-				stop.color = (!) color;-			}-		}--		if (stop_opacity != null && color != null) {-			((!) color).a = parse_number (stop_opacity);-		}-	}-	-	// links are ignored, add the content to the layer-	void parse_link (Layer layer, SvgStyle parent_style, XmlElement tag) {-		parse_layer (layer, parent_style, tag);-	}-	-	void parse_object (Layer layer, SvgStyle parent_style, XmlElement tag) {-		string name = tag.get_name ();-		-		if (name == "path") {-			parse_path (layer, parent_style, tag);-		}-							-		if (name == "polygon") {-			parse_polygon (layer, parent_style, tag);-		}--		if (name == "polyline") {-			parse_polyline (layer, parent_style, tag);-		}-		-		if (name == "rect") {-			parse_rect (layer, parent_style, tag);-		}--		if (name == "circle") {-			parse_circle (layer, parent_style, tag);-		}--		if (name == "ellipse") {-			parse_ellipse (layer, parent_style, tag);-		}-		-		if (name == "line") {-			parse_line (layer, parent_style, tag);-		}-	}--	private void parse_polygon (Layer layer, SvgStyle parent_style, XmlElement tag) {-		Polygon polygon = new Polygon ();--		foreach (Attribute attr in tag.get_attributes ()) {-			if (attr.get_name () == "points") {-				string data = add_separators (attr.get_content ());-				string[] point_data = data.split (" ");-				-				foreach (string number in point_data) {-					polygon.points.add (parse_number (number));-				}-			}-		}-		-		set_object_properties (polygon, parent_style, tag);-		layer.add_object (polygon);-	}-	-	void set_object_properties (Object object, SvgStyle parent_style, XmlElement tag) {-		Attributes attributes = tag.get_attributes ();-		-		foreach (Attribute attribute in attributes) {-			string name = attribute.get_name ();-			-			if (name == "id") {-				object.id = attribute.get_content ();-			} else if (name == "class") {-				object.css_class = attribute.get_content ();-			}-		}-		-		object.clip_path = get_clip_path (attributes);-		object.transforms = get_transform (attributes);-		object.style = SvgStyle.parse (drawing.defs, parent_style, tag);-		object.visible = is_visible (tag);-	}-		-	ClipPath? get_clip_path (Attributes attributes) {-		foreach (Attribute attribute in attributes) {-			if (attribute.get_name () == "clip-path") {-				return drawing.defs.get_clip_path_for_url (attribute.get_content ());-			}-		}-		-		return null;-	}-	-	private void parse_polyline (Layer layer, SvgStyle parent_style, XmlElement tag) {-		Polyline polyline = new Polyline ();--		foreach (Attribute attr in tag.get_attributes ()) {-			if (attr.get_name () == "points") {-				string data = add_separators (attr.get_content ());-				string[] point_data = data.split (" ");-				-				foreach (string number in point_data) {-					polyline.points.add (parse_number (number));-				}-			}-		}-		-		set_object_properties (polyline, parent_style, tag);-		layer.add_object (polyline);-	}-	-	private void parse_rect (Layer layer, SvgStyle parent_style, XmlElement tag) {-		Rectangle rectangle = new Rectangle ();--		foreach (Attribute attr in tag.get_attributes ()) {-			string attribute = attr.get_name ();-			-			if (attribute == "x") {-				rectangle.x = parse_number (attr.get_content ());-			}--			if (attribute == "y") {-				rectangle.y = parse_number (attr.get_content ());-			}--			if (attribute == "width") {-				rectangle.width = parse_number (attr.get_content ());-			}--			if (attribute == "height") {-				rectangle.height = parse_number (attr.get_content ());-			}-			-			if (attribute == "rx") {-				rectangle.rx = parse_number (attr.get_content ());-			}--			if (attribute == "ry") {-				rectangle.ry = parse_number (attr.get_content ());-			}-		}-		-		set_object_properties (rectangle, parent_style, tag);-		layer.add_object (rectangle);-	}-	-	private void parse_circle (Layer layer, SvgStyle parent_style, XmlElement tag) {-		Circle circle = new Circle ();-		-		foreach (Attribute attr in tag.get_attributes ()) {-			string name = attr.get_name ();-			-			if (name == "cx") {-				circle.cx = parse_number (attr.get_content ());-			}--			if (name == "cy") {-				circle.cy = parse_number (attr.get_content ());-			}-			-			if (name == "r") {-				circle.r = parse_number (attr.get_content ());-			}-		}-		-		set_object_properties (circle, parent_style, tag);-		layer.add_object (circle);-	}-	-	private void parse_ellipse (Layer layer, SvgStyle parent_style, XmlElement tag) {-		Ellipse ellipse = new Ellipse ();-		-		foreach (Attribute attr in tag.get_attributes ()) {-			string name = attr.get_name ();-			-			if (name == "cx") {-				ellipse.cx = parse_number (attr.get_content ());-			}--			if (name == "cy") {-				ellipse.cy = parse_number (attr.get_content ());-			}-			-			if (name == "rx") {-				ellipse.rx = parse_number (attr.get_content ());-			}-			-			if (name == "ry") {-				ellipse.ry = parse_number (attr.get_content ());-			}-		}-		-		set_object_properties (ellipse, parent_style, tag);-		layer.add_object (ellipse);-	}-	-	private void parse_line (Layer layer, SvgStyle parent_style, XmlElement tag) {-		Line line = new Line ();-		-		foreach (Attribute attr in tag.get_attributes ()) {-			string name = attr.get_name ();-			-			if (name == "x1") {-				line.x1 = parse_number (attr.get_content ());-			}--			if (name == "y1") {-				line.y1 = parse_number (attr.get_content ());-			}-			-			if (name == "x2") {-				line.x2 = parse_number (attr.get_content ());-			}-			-			if (name == "y2") {-				line.y2 = parse_number (attr.get_content ());-			}-		}-		-		set_object_properties (line, parent_style, tag);-		layer.add_object (line);-	}-	-	// FIXME: reverse order?-	public SvgTransforms parse_transform (string transforms) {-		string[] functions;-		string transform = transforms;-		SvgTransforms transform_functions;-		-		transform_functions = new SvgTransforms ();-		-		transform = transform.replace ("\t", " ");-		transform = transform.replace ("\n", " ");-		transform = transform.replace ("\r", " ");-		-		// use only a single space as separator-		while (transform.index_of ("  ") > -1) {-			transform = transform.replace ("  ", " ");-		}-		-		if (unlikely (transform.index_of (")") == -1)) {-			warning ("No parenthesis in transform function.");-			return transform_functions;-		}-		-		 // add separator-		transform = transform.replace (") ", "|");-		transform = transform.replace (")", "|"); -		functions = transform.split ("|");-		-		for (int i = 0; i < functions.length; i++) {-			if (functions[i].has_prefix ("translate")) {-				transform_functions.add (translate (functions[i]));-			}-			-			if (functions[i].has_prefix ("scale")) {-				transform_functions.add (scale (functions[i]));-			}--			if (functions[i].has_prefix ("matrix")) {-				transform_functions.add (matrix (functions[i]));-			}-			-			// TODO: rotate etc.-		}-		-		return transform_functions;-	}--	private SvgTransform matrix (string function) {-		string parameters = get_transform_parameters (function);-		string[] p = parameters.split (" ");-		SvgTransform transform = new SvgTransform ();-		transform.type = TransformType.MATRIX;-		-		if (unlikely (p.length != 6)) {-			warning ("Expecting six parameters for matrix transformation.");-			return transform;-		}-		-		for (int i = 0; i < 6; i++) {-			double argument = parse_double (p[i]);-			transform.arguments.add (argument);-		}-		-		return transform;-	}--    private static string remove_unit (string d) {-		string s = d.replace ("pt", "");-		s = s.replace ("pc", "");-		s = s.replace ("mm", "");-		s = s.replace ("cm", "");-		s = s.replace ("in", "");-		s = s.replace ("px", "");-		return s;-	}-    -	public static double parse_number (string? number_with_unit) {-		if (number_with_unit == null) {-			return 0;-		}-		-		string d = (!) number_with_unit;-		string s = remove_unit (d);-		double n = parse_double (s);-		-		if (d.has_suffix ("pt")) {-			n *= 1.25;-		} else if (d.has_suffix ("pc")) {-			n *= 15;-		} else if (d.has_suffix ("mm")) {-			n *= 3.543307;-		} else if (d.has_suffix ("cm")) {-			n *= 35.43307;-		} else if (d.has_suffix ("in")) {-			n *= 90;-		}-		-		return n;-	}-	-	private SvgTransform scale (string function) {-		string parameters = get_transform_parameters (function);-		string[] p = parameters.split (" ");-		SvgTransform transform = new SvgTransform ();-		transform.type = TransformType.SCALE;--		if (p.length > 0) {-			transform.arguments.add (parse_double (p[0]));-		}-		-		if (p.length > 1) {-			transform.arguments.add (parse_double (p[1]));-		}-		-		return transform;-	}-	-	private SvgTransform translate (string function) {-		string parameters = get_transform_parameters (function);-		string[] p = parameters.split (" ");-		SvgTransform transform = new SvgTransform ();-		transform.type = TransformType.TRANSLATE;-		-		if (p.length > 0) {-			transform.arguments.add (parse_double (p[0]));-		}-		-		if (p.length > 1) {-			transform.arguments.add (parse_double (p[1]));-		}-		-		return transform;-	}--	private string get_transform_parameters (string function) {-		int i;-		string param = "";-		-		i = function.index_of ("(");-		return_val_if_fail (i != -1, param);-		param = function.substring (i);--		param = param.replace ("(", "");-		param = param.replace ("\n", " ");-		param = param.replace ("\t", " ");-		param = param.replace (",", " ");-		-		while (param.index_of ("  ") > -1) {-			param.replace ("  ", " ");-		}-			-		return param.strip();			-	}--	private bool is_visible (XmlElement tag) {-		bool hidden = false;--		foreach (Attribute attr in tag.get_attributes ()) {-			if (attr.get_name () == "display" && attr.get_content () == "none") {-				hidden = true;-			}-			-			if (attr.get_name () == "visibility"-				&& (attr.get_content () == "hidden" -					|| attr.get_content () == "collapse")) {-				hidden = true;-			}-		}-		-		return !hidden;-	}--	private SvgTransforms get_transform (Attributes attributes) {-		foreach (Attribute attr in attributes) {-			if (attr.get_name () == "transform") {-				return parse_transform (attr.get_content ());-			}-		}-		-		return new SvgTransforms ();-	}-	-	private void parse_path (Layer layer, SvgStyle parent_style, XmlElement tag) {-		SvgPath path = new SvgPath ();--		foreach (Attribute attr in tag.get_attributes ()) {-			if (attr.get_name () == "d") {-				path.points = parse_points (attr.get_content ());-			}-		}-		-		set_object_properties (path, parent_style, tag);-		layer.add_object (path);-	}--	public Gee.ArrayList<Points> parse_points (string data) {-		Gee.ArrayList<Points> path_data = new Gee.ArrayList<Points> ();-		Points points = new Points ();-		BezierPoints[] bezier_points;-		int points_size;-	-		get_bezier_points (data, out bezier_points, out points_size, true);--		// all instructions are padded--		for (int i = 0; i < points_size; i++) {-			// FIXME: add more types-			if (bezier_points[i].type == 'M') {-				if (i == 0) {-					points.x = bezier_points[i].x0;-					points.y = bezier_points[i].y0;-				} else {-					points.add_type (POINT_LINE);-					points.add (bezier_points[i].x0);-					points.add (bezier_points[i].y0);-					points.add (0);-					points.add (0);-					points.add (0);-					points.add (0);-					points.add (0);-				}-			} else if (bezier_points[i].type == 'C') {-				points.add_type (POINT_CUBIC);-				points.add (bezier_points[i].x0);-				points.add (bezier_points[i].y0);-				points.add (bezier_points[i].x1);-				points.add (bezier_points[i].y1);-				points.add (bezier_points[i].x2);-				points.add (bezier_points[i].y2);-				points.add (0);-			} else if (bezier_points[i].type == 'L') {-				points.add_type (POINT_LINE);-				points.add (bezier_points[i].x0);-				points.add (bezier_points[i].y0);-				points.add (0);-				points.add (0);-				points.add (0);-				points.add (0);-				points.add (0);-			} else if (bezier_points[i].type == 'A') {-				BezierPoints b = bezier_points[i];-				double angle_start;-				double angle_extent;-				double center_x;-				double center_y;-				double rotation = b.angle;-								-				get_arc_arguments (b.x0, b.y0, b.rx, b.ry,-					b.angle, b.large_arc, b.sweep, b.x1, b.y1,-					out angle_start, out angle_extent,-					out center_x, out center_y);-				-				points.add_type (POINT_ARC);-				points.add (center_x);-				points.add (center_y);-				points.add (b.rx);-				points.add (b.ry);-				points.add (angle_start);-				points.add (angle_extent); -				points.add (rotation);-			} else if (bezier_points[i].type == 'z') {-				points.closed = true;-				path_data.add (points);-				points = new Points ();-			} else {-				string type = (!) bezier_points[i].type.to_string ();-				warning (@"SVG conversion not implemented for $type");-			}-		}--		if (points.size > 0) {-			path_data.add (points);-		}-		-		return path_data;-	}--	public static double parse_double (string? s) {-		if (unlikely (s == null)) {-			warning ("number is null");-			return 0;-		}-		-		if (unlikely (!double.try_parse ((!) s))) {-			warning (@"Expecting a double got: $((!) s)");-			return 0;-		}-		-		return double.parse ((!) s);-	}-	-	// FIXME: rename to instructions-	public static void get_bezier_points (string point_data, out BezierPoints[] bezier_points, out int points, bool svg_glyph) {-		double px = 0;-		double py = 0;-		double px2 = 0;-		double py2 = 0;-		double cx = 0;-		double cy = 0;-		string[] c;-		double arc_rx, arc_ry;-		double arc_rotation;-		int large_arc;-		int arc_sweep;-		double arc_dest_x, arc_dest_y;-		-		int bi = 0;--		string data = add_separators (point_data);-		c = data.split (" ");--		// the arc instruction can use up to eight points-		int bezier_points_length = 8 * c.length + 1;-		bezier_points = new BezierPoints[bezier_points_length]; -		-		for (int i = 0; i < bezier_points_length; i++) {-			bezier_points[i] = new BezierPoints ();-		}--		// parse path-		int i = -1;-		while (++i < c.length && bi < bezier_points.length) {	-			if (c[i] == "m") {-				while (i + 2 < c.length && is_point (c[i + 1])) {-					bezier_points[bi].type = 'M';-					bezier_points[bi].svg_type = 'm';-					-					px += parse_double (c[++i]);-					-					if (svg_glyph) {-						py += parse_double (c[++i]);-					} else {-						py += -parse_double (c[++i]);-					}-					-					bezier_points[bi].x0 = px;-					bezier_points[bi].y0 = py;-					bi++;-				}-			} else if (c[i] == "M") {-				while (i + 2 < c.length && is_point (c[i + 1])) {-					bezier_points[bi].type = 'M';-					bezier_points[bi].svg_type = 'M';-					-					px = parse_double (c[++i]);-					-					if (svg_glyph) {-						py = parse_double (c[++i]);-					} else {-						py = -parse_double (c[++i]);-					}-					-					bezier_points[bi].x0 = px;-					bezier_points[bi].y0 = py;-					bi++;-				}-			} else if (c[i] == "h") {-				while (i + 1 < c.length && is_point (c[i + 1])) {-					bezier_points[bi].type = 'L';-					bezier_points[bi].svg_type = 'h';-					-					px += parse_double (c[++i]);--					bezier_points[bi].x0 = px;-					bezier_points[bi].y0 = py;-					bi++;-				}-			} else if (i + 1 < c.length && c[i] == "H") {-				while (is_point (c[i + 1])) {-					bezier_points[bi].type = 'L';-					bezier_points[bi].svg_type = 'H';-					-					px = parse_double (c[++i]);--					bezier_points[bi].x0 = px;-					bezier_points[bi].y0 = py;-					bi++;-				}-			} else if (c[i] == "v") {-				while (i + 1 < c.length && is_point (c[i + 1])) {-					bezier_points[bi].type = 'L';-					bezier_points[bi].svg_type = 'v';-										-					if (svg_glyph) {-						py = py + parse_double (c[++i]);-					} else {-						py = py - parse_double (c[++i]);-					}-					-					bezier_points[bi].x0 = px;-					bezier_points[bi].y0 = py;-					bi++;-				}				-			} else if (i + 1 < c.length && c[i] == "V") {-				while (is_point (c[i + 1])) {-					bezier_points[bi].type = 'L';-					bezier_points[bi].svg_type = 'V';-										-					if (svg_glyph) {-						py = parse_double (c[++i]);-					} else {-						py = -parse_double (c[++i]);-					}-					-					bezier_points[bi].x0 = px;-					bezier_points[bi].y0 = py;-					bi++;-				}-			} else if (c[i] == "l") {-				while (i + 2 < c.length && is_point (c[i + 1])) {-					bezier_points[bi].type = 'L';-					bezier_points[bi].svg_type = 'l';-										-					cx = px + parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = py + parse_double (c[++i]);-					} else {-						cy = py - parse_double (c[++i]);-					}-					-					px = cx;-					py = cy;--					bezier_points[bi].x0 = cx;-					bezier_points[bi].y0 = cy;-					bi++;-				}-			} else if (c[i] == "L") {-				while (i + 2 < c.length && is_point (c[i + 1])) {-					bezier_points[bi].type = 'L';-					bezier_points[bi].svg_type = 'L';-										-					cx = parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = parse_double (c[++i]);-					} else {-						cy = -parse_double (c[++i]);-					}-					-					px = cx;-					py = cy;-					-					bezier_points[bi].x0 = cx;-					bezier_points[bi].y0 = cy;-					bi++;				-				}	-			} else if (c[i] == "c") {-				while (i + 6 < c.length && is_point (c[i + 1])) {-					bezier_points[bi].type = 'C';-					bezier_points[bi].svg_type = 'C';-										-					cx = px + parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = py + parse_double (c[++i]);-					} else {-						cy = py - parse_double (c[++i]);-					}-					-					bezier_points[bi].x0 = cx;-					bezier_points[bi].y0 = cy;-										-					cx = px + parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = py + parse_double (c[++i]);-					} else {-						cy = py - parse_double (c[++i]);-					}-					-					px2 = cx;-					py2 = cy;-										-					bezier_points[bi].x1 = px2;-					bezier_points[bi].y1 = py2;-										-					cx = px + parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = py + parse_double (c[++i]);-					} else {-						cy = py + -parse_double (c[++i]);-					}-					-					bezier_points[bi].x2 = cx;-					bezier_points[bi].y2 = cy;-										-					px = cx;-					py = cy;-					-					bi++;-				}-			} else if (c[i] == "C") {-				while (i + 6 < c.length && is_point (c[i + 1])) {-					bezier_points[bi].type = 'C';-					bezier_points[bi].svg_type = 'C';-										-					cx = parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = parse_double (c[++i]);-					} else {-						cy = -parse_double (c[++i]);-					}-									-					bezier_points[bi].x0 = cx;-					bezier_points[bi].y0 = cy;-					-					cx = parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = parse_double (c[++i]);-					} else {-						cy = -parse_double (c[++i]);-					}-					-					px2 = cx;-					py2 = cy;-					-					bezier_points[bi].x1 = cx;-					bezier_points[bi].y1 = cy;-										-					cx = parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = parse_double (c[++i]);-					} else {-						cy = -parse_double (c[++i]);-					}-					-					bezier_points[bi].x2 = cx;-					bezier_points[bi].y2 = cy;-										-					px = cx;-					py = cy;-					-					bi++;				-				}	-			} else if (c[i] == "q") {-				while (i + 4 < c.length && is_point (c[i + 1])) {-					bezier_points[bi].type = 'Q';-					bezier_points[bi].svg_type = 'q';-										-					cx = px + parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = py + parse_double (c[++i]);-					} else {-						cy = py - parse_double (c[++i]);-					}-					-					bezier_points[bi].x0 = cx;-					bezier_points[bi].y0 = cy;-										-					px2 = cx;-					py2 = cy;-										-					cx = px + parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = py + parse_double (c[++i]);-					} else {-						cy = py - parse_double (c[++i]);-					}-					-					bezier_points[bi].x1 = cx;-					bezier_points[bi].y1 = cy;-										-					px = cx;-					py = cy;-					-					bi++;-				}-			} else if (c[i] == "Q") {-				while (i + 4 < c.length && is_point (c[i + 1])) {-					bezier_points[bi].type = 'Q';-					bezier_points[bi].svg_type = 'Q';-										-					cx = parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = parse_double (c[++i]);-					} else {-						cy = -parse_double (c[++i]);-					}-					-					bezier_points[bi].x0 = cx;-					bezier_points[bi].y0 = cy;-					-					px2 = cx;-					py2 = cy;-										-					cx = parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = parse_double (c[++i]);-					} else {-						cy = -parse_double (c[++i]);-					}-					-					px = cx;-					py = cy;--					bezier_points[bi].x1 = cx;-					bezier_points[bi].y1 = cy;-										-					bi++;					-				}	-			} else if (c[i] == "t") {-				while (i + 2 < c.length && is_point (c[i + 1])) {-					bezier_points[bi].type = 'Q';-					bezier_points[bi].svg_type = 't';-										-					// the first point is the reflection-					cx = 2 * px - px2;-					cy = 2 * py - py2; // if (svg_glyph) ?-					-					bezier_points[bi].x0 = cx;-					bezier_points[bi].y0 = cy;-					-					px2 = cx;-					py2 = cy;-										-					cx = px + parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = py + parse_double (c[++i]);-					} else {-						cy = py - parse_double (c[++i]);-					}-					-					px = cx;-					py = cy;-					-					bezier_points[bi].x1 = px;-					bezier_points[bi].y1 = py;-										-					bi++;-				}-			} else if (c[i] == "T") {-				while (i + 2 < c.length && is_point (c[i + 1])) {-					bezier_points[bi].type = 'Q';-					bezier_points[bi].svg_type = 'T';-										-					// the reflection-					cx = 2 * px - px2;-					cy = 2 * py - py2;-					-					bezier_points[bi].x0 = cx;-					bezier_points[bi].y0 = cy;-										-					px2 = cx;-					py2 = cy;-					-					cx = parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = parse_double (c[++i]);-					} else {-						cy = -parse_double (c[++i]);-					}-					-					px = cx;-					py = cy;-					-					bezier_points[bi].x1 = px;-					bezier_points[bi].y1 = py;-										-					bi++;				-				}-			} else if (c[i] == "s") {-				while (i + 4 < c.length && is_point (c[i + 1])) {-					bezier_points[bi].type = 'C';-					bezier_points[bi].svg_type = 's';-										-					// the first point is the reflection-					cx = 2 * px - px2;-					cy = 2 * py - py2; // if (svg_glyph) ?--					bezier_points[bi].x0 = cx;-					bezier_points[bi].y0 = cy;-															-					cx = px + parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = py + parse_double (c[++i]);-					} else {-						cy = py - parse_double (c[++i]);-					}-					-					px2 = cx;-					py2 = cy;-					-					bezier_points[bi].x1 = px2;-					bezier_points[bi].y1 = py2;-					-					cx = px + parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = py + parse_double (c[++i]);-					} else {-						cy = py - parse_double (c[++i]);-					}-					-					bezier_points[bi].x2 = cx;-					bezier_points[bi].y2 = cy;-												-					px = cx;-					py = cy;-					-					bi++;-				}-			} else if (c[i] == "S") {-				while (i + 4 < c.length && is_point (c[i + 1])) {-					bezier_points[bi].type = 'C';-					bezier_points[bi].svg_type = 'S';-										-					// the reflection-					cx = 2 * px - px2;-					cy = 2 * py - py2; // if (svg_glyph) ?			--					bezier_points[bi].x0 = cx;-					bezier_points[bi].y0 = cy;-					-					// the other two are regular cubic points-					cx = parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = parse_double (c[++i]);-					} else {-						cy = -parse_double (c[++i]);-					}-					-					px2 = cx;-					py2 = cy;-					-					bezier_points[bi].x1 = px2;-					bezier_points[bi].y1 = py2;-					-					cx = parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = parse_double (c[++i]);-					} else {-						cy = -parse_double (c[++i]);-					}-					-					bezier_points[bi].x2 = cx;-					bezier_points[bi].y2 = cy;-					-					px = cx;-					py = cy;	-					-					bi++;-				}-			} else if (c[i] == "a") {-				while (i + 7 < c.length && is_point (c[i + 1])) {					-					arc_rx = parse_double (c[++i]);-					arc_ry = parse_double (c[++i]);-					-					arc_rotation = PI * (parse_double (c[++i]) / 180.0);-					large_arc = parse_int (c[++i]);-					arc_sweep = parse_int (c[++i]);-							-					cx = px + parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = py + parse_double (c[++i]);-					} else {-						cy = py - parse_double (c[++i]);-					}-					-					arc_dest_x = cx;-					arc_dest_y = cy;-					-					bezier_points[bi].type = 'A';-					bezier_points[bi].svg_type = 'a';-					bezier_points[bi].x0 = px;-					bezier_points[bi].y0 = py;-					bezier_points[bi].x1 = cx;-					bezier_points[bi].y1 = cy;-					bezier_points[bi].rx = arc_rx;-					bezier_points[bi].ry = arc_ry;-					bezier_points[bi].angle = arc_rotation;-					bezier_points[bi].large_arc = large_arc == 1;-					bezier_points[bi].sweep = arc_sweep == 1;-					bi++;-					-					px = cx;-					py = cy;-				}-			} else if (i + 7 < c.length && c[i] == "A") {-				while (is_point (c[i + 1])) {					-					arc_rx = parse_double (c[++i]);-					arc_ry = parse_double (c[++i]);-					-					arc_rotation = PI * (parse_double (c[++i]) / 180.0);-					large_arc = parse_int (c[++i]);-					arc_sweep = parse_int (c[++i]);-							-					cx = parse_double (c[++i]);-					-					if (svg_glyph) {-						cy = parse_double (c[++i]);-					} else {-						cy = -parse_double (c[++i]);-					}-					-					arc_dest_x = cx;-					arc_dest_y = cy;-					-					bezier_points[bi].type = 'A';-					bezier_points[bi].svg_type = 'A';-					bezier_points[bi].x0 = px;-					bezier_points[bi].y0 = py;-					bezier_points[bi].x1 = cx;-					bezier_points[bi].y1 = cy;-					bezier_points[bi].rx = arc_rx;-					bezier_points[bi].ry = arc_ry;-					bezier_points[bi].angle = arc_rotation;-					bezier_points[bi].large_arc = large_arc == 1;-					bezier_points[bi].sweep = arc_sweep == 1;-					bi++;-					-					px = cx;-					py = cy;-				}-			} else if (c[i] == "z") {-				bezier_points[bi].type = 'z';-				bezier_points[bi].svg_type = 'z';-				-				bi++;-			} else if (c[i] == "Z") {-				bezier_points[bi].type = 'z';-				bezier_points[bi].svg_type = 'z';-									-				bi++;-			} else if (c[i] == "") {-			} else if (c[i] == " ") {-			} else {-				warning (@"Unknown instruction: $(c[i])");-			}-		}-		-		if (bi == 0) {-			warning ("No points in path.");-		}--		points = bi;-	}--	static int parse_int (string? s) {-		if (unlikely (s == null)) {-			warning ("null instead of string");-			return 0;-		}-		-		if (unlikely (!int64.try_parse ((!) s))) {-			warning (@"Expecting an integer: $((!) s)");-			return 0;-		}-		-		return int.parse ((!) s);-	}--	static bool is_point (string? s) {-		if (unlikely (s == null)) {-			warning ("s is null");-			return false;-		}-		-		return double.try_parse ((!) s);-	}--	/** Add space as separator to svg data. -	 * @param d svg data-	 */-	public static string add_separators (string d) {-		string data = d;-		-		data = data.replace (",", " ");-		data = data.replace ("a", " a ");-		data = data.replace ("A", " A ");-		data = data.replace ("m", " m ");-		data = data.replace ("M", " M ");-		data = data.replace ("h", " h ");-		data = data.replace ("H", " H ");-		data = data.replace ("v", " v ");-		data = data.replace ("V", " V ");-		data = data.replace ("l", " l ");-		data = data.replace ("L", " L ");-		data = data.replace ("q", " q ");-		data = data.replace ("Q", " Q ");		-		data = data.replace ("c", " c ");-		data = data.replace ("C", " C ");-		data = data.replace ("t", " t ");-		data = data.replace ("T", " T ");-		data = data.replace ("s", " s ");-		data = data.replace ("S", " S ");-		data = data.replace ("zM", " z M ");-		data = data.replace ("zm", " z m ");-		data = data.replace ("z", " z ");-		data = data.replace ("Z", " Z ");-		data = data.replace ("-", " -");-		data = data.replace ("e -", "e-"); // minus can be either separator or a negative exponent-		data = data.replace ("\t", " ");-		data = data.replace ("\r\n", " ");-		data = data.replace ("\n", " ");-		-		// use only a single space as separator-		while (data.index_of ("  ") > -1) {-			data = data.replace ("  ", " ");-		}-		-		return data;-	}--}--}diff --git a/libsvgbird/SvgPath.vala b/libsvgbird/SvgPath.valadeleted file mode 100644index af2a41d..0000000--- a/libsvgbird/SvgPath.vala+++ /dev/null@@ -1,115 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;--namespace SvgBird {--public class SvgPath : Object {	-	public Gee.ArrayList<Points> points = new Gee.ArrayList<Points> ();-	-	public SvgPath () {-	}--	public SvgPath.create_copy (SvgPath p) {-		Object.copy_attributes (p, this);-	}-	-	public override bool is_over (double x, double y) {-		return false;-	}-			-	public override void draw_outline (Context cr) {-		foreach (Points p in points) {-			cr.move_to (p.x, p.y);-			draw_points (cr, p);-			-			if (p.closed) {-				cr.close_path ();-			}-		}-	}--	public void draw_points (Context cr, Points path) {-		PointValue* points = path.point_data.data;-		int size = path.point_data.size;-		-		return_if_fail (size % 8 == 0);-		-		for (int i = 0; i < size; i += 8) {-			switch (points[i].type) {-			case POINT_ARC:		-				draw_arc (cr, points[i + 1].value, points[i + 2].value,-					points[i + 3].value, points[i + 4].value,-					points[i + 5].value, points[i + 6].value,-					points[i + 7].value);-				break;-			case POINT_CUBIC:-				cr.curve_to (points[i + 1].value, points[i + 2].value, -					points[i + 3].value, points[i + 4].value,-					points[i + 5].value, points[i + 6].value);-				break;-			case POINT_LINE:-				cr.line_to (points[i + 1].value, points[i + 2].value);-				break;-			}-		}		-	}--	static void draw_arc (Context cr,-		double x, double y,-		double rx, double ry,-		double angle_start, double angle_extent,-		double rotation) {-			-		cr.save ();-		cr.translate (x, y);-		cr.rotate (rotation);-		cr.scale (rx, ry);--		if (angle_extent > 0) {-			cr.arc_negative (0, 0, 1, -angle_start, -angle_start - angle_extent);-		} else {-			cr.arc (0, 0, 1, -angle_start, -angle_start - angle_extent);-		}-				-		cr.restore ();-	}--	public override void move (double dx, double dy) {-	}-	-	public override void update_region_boundaries () {-	}--	public override void rotate (double theta, double xc, double yc) {-	}-	-	public override bool is_empty () {-		return false;-	}-	-	public override void resize (double ratio_x, double ratio_y) {-	}-	-	public override Object copy () {-		return new SvgPath.create_copy (this);-	}--	public override string to_string () {-		return "SvgPath";-	}-}--}diff --git a/libsvgbird/SvgStyle.vala b/libsvgbird/SvgStyle.valadeleted file mode 100644index 111b52c..0000000--- a/libsvgbird/SvgStyle.vala+++ /dev/null@@ -1,415 +0,0 @@-/*-	Copyright (C) 2015 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using B;-using Math;--namespace SvgBird {--public class SvgStyle : GLib.Object {-	public Gee.HashMap<string, string> style = new Gee.HashMap<string, string> ();-	-	public Color? stroke = null;-	public Color? fill = null;-	public Gradient? stroke_gradient = null;-	public Gradient? fill_gradient = null;--	public double stroke_width = 0;--	private static Gee.HashMap<string, string>? inheritance;-	private static Mutex inheritance_mutex = new Mutex ();-	-	public SvgStyle () {-	}-	-	public SvgStyle.for_properties (Defs? defs, string style) {-		parse_key_value_pairs (style);-		set_style_properties (defs, this);-	}--	public void set_style (string property, string style) {-		this.style.set (property, style);-	}-	-	public bool property_equals (string property, string value) {-		string? p = get_css_property (property);-		-		if (p == null) {-			return false;-		}-		-		string css_property = (!) p;-		return css_property == value;-	}--	public bool has_css_property (string property) {-		return style.has_key (property);-	}--	public string? get_css_property (string property) {-		string p = property.down ();-		-		if (!has_css_property (p)) {-			return null;-		}-		-		return style.get (p);-	}-	-	public static bool is_inherited (string property) {-		inheritance_mutex.lock ();-		if (unlikely (inheritance == null)) {-			create_inheritance_table ();-		}-		-		Gee.HashMap<string, string> inheritance = (!) inheritance;-		string? inherited = inheritance.get (property);-		inheritance_mutex.unlock ();--		if (inherited == null) {-			return false;-		}-		-		string inherited_property = (!) inherited;-		return inherited_property == "yes";-	}--	/** Specify inheritance for a CSS property. */-	public static void set_inheritance (string property, bool inherit) {-		inheritance_mutex.lock ();-		if (unlikely (inheritance == null)) {-			create_inheritance_table ();-		}-		-		Gee.HashMap<string, string> inheritance = (!) inheritance;-		string inherit_property = inherit ? "yes" : "no";-		inheritance.set (property, inherit_property);-		inheritance_mutex.unlock ();-	}--	public SvgStyle copy () {-		SvgStyle style = new SvgStyle ();-		style.apply (this);-		return style;-	}--	public LineCap get_line_cap () {-		string l;-		-		if (!style.has_key ("stroke-linecap")) {-			return LineCap.BUTT;-		}-		-		l = style.get ("stroke-linecap");-		-		if (l == "round") {-			return LineCap.ROUND;-		} else if (l == "square") {-			return LineCap.SQUARE;-		}-		-		return LineCap.BUTT; 	-	}-	-	public bool has_stroke () {-		bool s = true;-		-		if (style.has_key ("stroke")) {-			s = style.get ("stroke") != "none";-		}-				-		return stroke_width > 0 && s;-	}-		-	public double get_stroke_width () {-		return stroke_width;-	}-	-	public string to_string () {-		StringBuilder description = new StringBuilder ();-		-		description.append ("SvgStyle: ");-		-		foreach (string key in style.keys) {-			description.append (key);-			description.append (": ");-			description.append (style.get (key));-			description.append ("; ");-		}-		-		return description.str.strip ();-	}-	-	public void inherit (SvgStyle inherited) {-		foreach (string key in inherited.style.keys) {-			if (is_inherited (key)) {-				style.set (key, inherited.style.get (key));-			}-		}-	}--	public void apply (SvgStyle inherited) {-		foreach (string key in inherited.style.keys) {-			style.set (key, inherited.style.get (key));-		}-	}-	-	public static SvgStyle parse (Defs? d, SvgStyle inherited, XmlElement tag) {-		SvgStyle s = new SvgStyle ();-		Attributes attributes = tag.get_attributes ();--		s.style.set ("fill", "#000000"); // default fill value		-		s.inherit (inherited);-		-		if (d != null) {-			StyleSheet style_sheet = ((!) d).style_sheet;-			style_sheet.apply_style (tag, s);-		}--		foreach (Attribute a in attributes) {-			if (a.get_name () == "style") {-				s.parse_key_value_pairs (a.get_content ());-			}-			-			if (a.get_name () == "stroke-width") {-				s.style.set ("stroke-width", a.get_content ());-			}--			if (a.get_name () == "stroke") {-				s.style.set ("stroke", a.get_content ());-			}--			if (a.get_name () == "fill") {-				s.style.set ("fill", a.get_content ());-			}--			if (a.get_name () == "fill-opacity") {-				s.style.set ("fill-opacity", a.get_content ());-			}--			if (a.get_name () == "stroke-opacity") {-				s.style.set ("stroke-opacity", a.get_content ());-			}-		}-	-		set_style_properties (d, s);-		return s;-	}-	-	static void set_style_properties (Defs? d, SvgStyle s) {-		double fill_opacity = 1;-		double stroke_opacity = 1;--		s.stroke_width = SvgFile.parse_number (s.style.get ("stroke-width"));-		s.stroke = Color.parse (s.style.get ("stroke"));-		s.fill = Color.parse (s.style.get ("fill"));--		string? opacity = s.style.get ("fill-opacity");-		if (opacity != null) {-			fill_opacity = SvgFile.parse_number ((!) opacity);-		}--		opacity = s.style.get ("stroke-opacity");-		if (opacity != null) {-			stroke_opacity = SvgFile.parse_number ((!) opacity);-		}-			-		if (d != null) {-			Defs defs = (!) d;--			s.stroke_gradient = defs.get_gradient_for_url (s.style.get ("stroke"));-			s.fill_gradient = defs.get_gradient_for_url (s.style.get ("fill"));-		}-		-		if (s.fill != null) {-			Color color = (!) s.fill;-			color.a = fill_opacity;-		}-		-		if (s.stroke != null) {-			Color color = (!) s.stroke;-			color.a = stroke_opacity;-		}		-	}-	-	void parse_key_value_pairs (string svg_style) {-		string[] p = svg_style.strip ().split (";");-		string[] pair;-		string k, v;-		-		foreach (string kv in p) {-			if (kv.index_of (":") != -1) {-				pair = kv.split (":");-				-				if (pair.length != 2) {-					warning ("pair.length != 2 in " + svg_style);-					continue;-				}-				-				k = pair[0].strip ().down ();-				v = pair[1].strip ().down ();-				-				if (k == "padding") {-					parse_padding_shorthand (v);-				} else {-					style.set (k, v);-				}-			}-		}-	}-	-	void parse_padding_shorthand (string arguments) {-		string[] args = StyleSheet.replace_whitespace (arguments).split (" ");-		-		if (args.length > 0) {-			style.set ("padding-top", args[0]);-		}-		-		if (args.length > 1) {-			style.set ("padding-right", args[1]);-		}--		if (args.length > 2) {-			style.set ("padding-bottom", args[2]);-		}--		if (args.length > 3) {-			style.set ("padding-left", args[3]);-		}-	}--	private static void create_inheritance_table () {-		inheritance = new Gee.HashMap<string, string> ();-		-		Gee.HashMap<string, string> inherited = (!) inheritance;-		-		inherited.set ("azimuth", "yes");-		inherited.set ("background-attachment", "no");-		inherited.set ("background-color", "no");-		inherited.set ("background-image", "no");-		inherited.set ("background-position", "no");-		inherited.set ("background-repeat", "no");-		inherited.set ("background", "no");-		inherited.set ("border-collapse", "yes");-		inherited.set ("border-color", "no");-		inherited.set ("border-spacing", "yes");-		inherited.set ("border-style", "no");-		inherited.set ("border-top", "no");-		inherited.set ("border-right", "no");-		inherited.set ("border-bottom", "no");-		inherited.set ("border-left", "no");-		inherited.set ("border-top-color", "no");-		inherited.set ("border-right-color", "no");-		inherited.set ("border-bottom-color", "no");-		inherited.set ("border-left-color", "no");-		inherited.set ("border-top-style", "no");-		inherited.set ("border-right-style", "no");-		inherited.set ("border-bottom-style", "no");-		inherited.set ("border-left-style", "no");-		inherited.set ("border-top-width", "no");-		inherited.set ("border-right-width", "no");-		inherited.set ("border-bottom-width", "no");-		inherited.set ("border-left-width", "no");-		inherited.set ("border-width", "no");-		inherited.set ("border", "no");-		inherited.set ("bottom", "no");-		inherited.set ("caption-side", "yes");-		inherited.set ("clear", "no");-		inherited.set ("clip", "no");-		inherited.set ("color", "yes");-		inherited.set ("content", "no");-		inherited.set ("counter-increment", "no");-		inherited.set ("counter-reset", "no");-		inherited.set ("cue-after", "no");-		inherited.set ("cue-before", "no");-		inherited.set ("cue", "no");-		inherited.set ("cursor", "yes");-		inherited.set ("direction", "yes");-		inherited.set ("display", "no");-		inherited.set ("elevation", "yes");-		inherited.set ("empty-cells", "yes");-		inherited.set ("float", "no");-		inherited.set ("font-family", "yes");-		inherited.set ("font-size", "yes");-		inherited.set ("font-style", "yes");-		inherited.set ("font-variant", "yes");-		inherited.set ("font-weight", "yes");-		inherited.set ("font", "yes");-		inherited.set ("height", "no");-		inherited.set ("left", "no");-		inherited.set ("letter-spacing", "yes");-		inherited.set ("line-height", "yes");-		inherited.set ("list-style-image", "yes");-		inherited.set ("list-style-position", "yes");-		inherited.set ("list-style-type", "yes");-		inherited.set ("list-style", "yes");-		inherited.set ("margin-right", "no");-		inherited.set ("margin-left", "no");-		inherited.set ("margin-top", "no");-		inherited.set ("margin-bottom", "no");-		inherited.set ("margin", "no");-		inherited.set ("max-height", "no");-		inherited.set ("max-width", "no");-		inherited.set ("min-height", "no");-		inherited.set ("min-width", "no");-		inherited.set ("orphans", "yes");-		inherited.set ("outline-color", "no");-		inherited.set ("outline-style", "no");-		inherited.set ("outline-width", "no");-		inherited.set ("outline", "no");-		inherited.set ("overflow", "no");-		inherited.set ("padding-top", "no");-		inherited.set ("padding-right", "no");-		inherited.set ("padding-bottom", "no");-		inherited.set ("padding-left", "no");-		inherited.set ("padding", "no");-		inherited.set ("page-break-after", "no");-		inherited.set ("page-break-before", "no");-		inherited.set ("page-break-inside", "no");-		inherited.set ("pause-after", "no");-		inherited.set ("pause-before", "no");-		inherited.set ("pause", "no");-		inherited.set ("pitch-range", "yes");-		inherited.set ("pitch", "yes");-		inherited.set ("play-during", "no");-		inherited.set ("position", "no");-		inherited.set ("quotes", "yes");-		inherited.set ("richness", "yes");-		inherited.set ("right", "no");-		inherited.set ("speak-header", "yes");-		inherited.set ("speak-numeral", "yes");-		inherited.set ("speak-punctuation", "yes");-		inherited.set ("speak", "yes");-		inherited.set ("speech-rate", "yes");-		inherited.set ("stress", "yes");-		inherited.set ("table-layout", "no");-		inherited.set ("text-align", "yes");-		inherited.set ("text-decoration", "no");-		inherited.set ("text-indent", "yes");-		inherited.set ("text-transform", "yes");-		inherited.set ("top", "no");-		inherited.set ("unicode-bidi", "no");-		inherited.set ("vertical-align", "no");-		inherited.set ("visibility", "yes");-		inherited.set ("voice-family", "yes");-		inherited.set ("volume", "yes");-		inherited.set ("white-space", "yes");-		inherited.set ("widows", "yes");-		inherited.set ("width", "no");-		inherited.set ("word-spacing", "yes");-		inherited.set ("z-index", "no");-	}-}--}diff --git a/libsvgbird/SvgTransform.vala b/libsvgbird/SvgTransform.valadeleted file mode 100644index e2e8527..0000000--- a/libsvgbird/SvgTransform.vala+++ /dev/null@@ -1,88 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using B;-using Cairo;--namespace SvgBird {--public enum TransformType {-	NONE,-	TRANSLATE,-	MATRIX,-	SCALE-}--public class SvgTransform : GLib.Object {-	public TransformType type = TransformType.NONE;-	public Doubles arguments = new Doubles.for_capacity (10);-	-	public SvgTransform () {-	}--	public string to_string () {-		StringBuilder sb = new StringBuilder ();-		-		sb.append (@"$type");-		sb.append (" ");-		-		for (int i = 0; i < arguments.size; i++) {-			sb.append (@"$(arguments.get_double (i)) ");-		}--		return sb.str;-	}-		-	public Matrix get_matrix () {-		Matrix matrix;-		-		matrix = Matrix.identity ();-		-		if (type == TransformType.SCALE) {-			if (arguments.size == 1) {-				double s = arguments.get_double (0);-				matrix.scale (s, s);-				return matrix;-			} else if (arguments.size == 2) {-				double s0 = arguments.get_double (0);-				double s1 = arguments.get_double (1);-				matrix.scale (s0, s1);-			}-		} else if (type == TransformType.TRANSLATE) {-			if (arguments.size == 1) {-				double s = arguments.get_double (0);-				matrix.translate (s, 0);-			} else if (arguments.size == 2) {-				double s0 = arguments.get_double (0);-				double s1 = arguments.get_double (1);-				matrix.translate (s0, s1);-			}-		} else if (type == TransformType.MATRIX) {-			if (arguments.size == 6) {-				double s0 = arguments.get_double (0);-				double s1 = arguments.get_double (1);-				double s2 = arguments.get_double (2);-				double s3 = arguments.get_double (3);					-				double s4 = arguments.get_double (4);-				double s5 = arguments.get_double (5);-				-				matrix = Matrix (s0, s1, s2, s3, s4, s5);-			}-		}-		-		return matrix;-	}-}--}diff --git a/libsvgbird/SvgTransforms.vala b/libsvgbird/SvgTransforms.valadeleted file mode 100644index 73f7018..0000000--- a/libsvgbird/SvgTransforms.vala+++ /dev/null@@ -1,58 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--using Cairo;--namespace SvgBird {--public class SvgTransforms : GLib.Object {-	public Gee.ArrayList<SvgTransform> transforms;-	-	public SvgTransforms () {-		transforms = new Gee.ArrayList<SvgTransform> ();-	}--	public void add (SvgTransform transform) {-		transforms.add (transform);-	}-	-	public Matrix get_matrix () {-		Matrix matrix = Matrix.identity ();-		-		if (transforms.size == 0) {-			return Matrix.identity ();-		}-		-		matrix = transforms.get (0).get_matrix ();-		-		for (int i = 1; i < transforms.size; i++) {-			matrix.multiply (matrix, transforms.get (i).get_matrix ());-		}-		-		return matrix;-	}-	-	public string to_string () {-		StringBuilder sb = new StringBuilder ();-		-		foreach (SvgTransform t in transforms) {-			sb.append (t.to_string ());-			sb.append (" ");-		}-		-		return sb.str;-	}-}--}diff --git a/libsvgbird/point_value.h b/libsvgbird/point_value.hdeleted file mode 100644index 19035a3..0000000--- a/libsvgbird/point_value.h+++ /dev/null@@ -1,21 +0,0 @@-/*-	Copyright (C) 2016 Johan Mattsson--	This library is free software; you can redistribute it and/or modify -	it under the terms of the GNU Lesser General Public License as -	published by the Free Software Foundation; either version 3 of the -	License, or (at your option) any later version.--	This library is distributed in the hope that it will be useful, but -	WITHOUT ANY WARRANTY; without even the implied warranty of -	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -	Lesser General Public License for more details.-*/--#include<glib.h>--typedef union {-	gdouble value;-	guchar type;-} SvgBirdPointValue;-diff --git a/po/birdfont.pot b/po/birdfont.potindex f11d2d0..410a111 100644--- a/po/birdfont.pot+++ b/po/birdfont.pot@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"+"POT-Creation-Date: 2017-06-14 17:09+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"@@ -83,11 +83,16 @@ msgstr "" msgid "Background Image" msgstr "" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr ""++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "" @@ -96,7 +101,7 @@ msgid "Images" msgstr ""  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "" @@ -104,16 +109,16 @@ msgstr "" msgid "Parts" msgstr "" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr ""@@ -130,10 +135,6 @@ msgstr "" msgid "corner" msgstr "" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr ""- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr ""@@ -187,18 +188,18 @@ msgid "Thai" msgstr ""  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr ""  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr ""  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description" msgstr "" @@ -207,7 +208,7 @@ msgid "PostScript Name" msgstr ""  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "" @@ -235,9 +236,9 @@ msgstr "" msgid "Unique Identifier" msgstr "" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "" @@ -309,7 +310,7 @@ msgstr "" msgid "Geometrical Shapes" msgstr "" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "" @@ -321,12 +322,16 @@ msgstr "" msgid "Grid Size" msgstr "" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -345,197 +350,192 @@ msgstr "" msgid "Insert new points on path" msgstr "" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "" -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path" msgstr "" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 msgid "Move to path to the bottom of the layer" msgstr "" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines" msgstr "" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr ""  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "" @@ -547,7 +547,7 @@ msgstr "" msgid "Units Per Em" msgstr "" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "" @@ -555,17 +555,17 @@ msgstr "" msgid "Formats" msgstr "" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "" @@ -614,50 +614,50 @@ msgstr "" msgid "Save font" msgstr "" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr ""  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left" msgstr "" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right" msgstr "" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "" @@ -669,10 +669,6 @@ msgstr "" msgid "Guides" msgstr "" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr ""@@ -701,50 +697,44 @@ msgstr "" msgid "SVG-FILES ..." msgstr "" -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "" -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "" -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "" -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "" -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "" @@ -760,16 +750,16 @@ msgstr "" msgid "Type “space” to kern the space character and “divis” to kern -." msgstr "" -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "" @@ -781,16 +771,16 @@ msgstr "" msgid "No kerning pairs created." msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "" @@ -802,51 +792,56 @@ msgstr "" msgid "Kerning Tools" msgstr "" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "" -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "" -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "" -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "" -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions" msgstr "" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "" @@ -854,11 +849,7 @@ msgstr "" msgid "Character Set" msgstr "" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer" msgstr "" @@ -899,23 +890,23 @@ msgid "Contextual Substitutions" msgstr ""  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "" @@ -943,7 +934,7 @@ msgstr "" msgid "You need an older version of Birdfont to open it." msgstr "" -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "" @@ -955,7 +946,7 @@ msgstr "" msgid "New" msgstr "" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files" msgstr "" @@ -1003,8 +994,8 @@ msgstr "" msgid "Move To Baseline" msgstr "" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "" @@ -1076,106 +1067,98 @@ msgstr "" msgid "Export Glyph as SVG" msgstr "" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 msgid "Tab" msgstr "" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 msgid "Next Tab" msgstr "" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 msgid "Previous Tab" msgstr "" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 msgid "Close Tab" msgstr "" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs" msgstr "" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr ""@@ -1209,7 +1192,11 @@ msgstr "" msgid "Menu" msgstr "" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+msgid "Can't create TTF font."+msgstr ""++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "" @@ -1217,27 +1204,31 @@ msgstr "" msgid "Move paths" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "" @@ -1257,11 +1248,15 @@ msgstr "" msgid "Swashes" msgstr "" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr ""++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "" @@ -1282,43 +1277,44 @@ msgstr "" msgid "Yes, don't ask again." msgstr "" -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "" @@ -1334,7 +1330,7 @@ msgstr "" msgid "Add new points" msgstr "" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "" @@ -1350,19 +1346,19 @@ msgstr "" msgid "Generate html document" msgstr "" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 msgid "Glyphs" msgstr "" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 msgid "Backups" msgstr "" @@ -1386,43 +1382,47 @@ msgstr "" msgid "Save?" msgstr "" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "" -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "" -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+msgid "Translate"+msgstr ""++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "" @@ -1434,287 +1434,291 @@ msgstr "" msgid "Left" msgstr "" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr ""++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "" @@ -1722,7 +1726,7 @@ msgstr "" msgid "Color" msgstr "" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "" @@ -1734,7 +1738,7 @@ msgstr "" msgid "New version" msgstr "" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "" diff --git a/po/cs.po b/po/cs.poindex 9c42b65..920e92b 100644--- a/po/cs.po+++ b/po/cs.po@@ -5,9 +5,9 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-11-03 22:37+0000\n"-"Last-Translator: fri <pavelfric@yahoo.com>\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2016-10-22 19:11+0000\n"+"Last-Translator: Anonymous Pootle User\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" "Language: cs\n" "MIME-Version: 1.0\n"@@ -15,7 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1446590271.000000\n"+"X-POOTLE-MTIME: 1477163484.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"@@ -31,7 +31,7 @@ msgstr "SOUBOR" #: libbirdfont/Argument.vala:279 libbirdfont/ExportUtils.vala:19 #: birdfont-autotrace/AutoTrace.vala:68 msgid "OPTION"-msgstr "PŘEPÍNAČ"+msgstr "VOLBA"  #: libbirdfont/Argument.vala:281 msgid "enable Android customizations"@@ -47,7 +47,7 @@ msgstr "Ukončit, pokud zkouška selže"  #: libbirdfont/Argument.vala:284 msgid "treat warnings as fatal"-msgstr "Upozornění budou považována za chyby"+msgstr "Varování, úprava je osudná "  #: libbirdfont/Argument.vala:285 msgid "show this message"@@ -85,11 +85,16 @@ msgstr "Vybrat pozadí" msgid "Background Image" msgstr "Obrázek pozadí" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Posunout, změnit velikost a otočit obrázek pozadí" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr "na ose"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Vybrat obrázek pozadí" @@ -98,7 +103,7 @@ msgid "Images" msgstr "Obrázky"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Soubory" @@ -106,16 +111,16 @@ msgstr "Soubory" msgid "Parts" msgstr "Části" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Přidat" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "Vybrat znak" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Otevřít"@@ -132,10 +137,6 @@ msgstr "čára" msgid "corner" msgstr "Roh" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr "na ose"- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "Kruh"@@ -150,7 +151,7 @@ msgstr "Výchozí jazyk"  #: libbirdfont/DefaultCharactersSet.vala:26 msgid "Private Use Area"-msgstr "Rozsah pro vlasní znaky"+msgstr "Uživatelská oblast"  #: libbirdfont/DefaultCharactersSet.vala:28 msgid "Chinese"@@ -189,14 +190,14 @@ msgid "Thai" msgstr "Thajština"  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "" "a á b c č d ď e é ě f g h i í j k l m n ň o ó p q r ř s š t ť u ú ů v w x y " "ý z ž"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr "" "A Á B C Č D Ď E É Ě F G H I Í J K L M N Ň O Ó P Q R Ř S Š T Ť U Ú Ů V W X Y "@@ -204,7 +205,7 @@ msgstr ""  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description" msgstr "Název a popis" @@ -213,7 +214,7 @@ msgid "PostScript Name" msgstr "Název PostScript"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Název" @@ -241,9 +242,9 @@ msgstr "Celý název (název a styl)" msgid "Unique Identifier" msgstr "Jedinečný identifikátor" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Verze" @@ -289,7 +290,7 @@ msgstr "Nástroje pro práci s pozadím"  #: libbirdfont/DrawingTools.vala:113 msgid "Control Points"-msgstr "Ovládací body"+msgstr "Kontrolní body"  #: libbirdfont/DrawingTools.vala:114 msgid "Object Tools"@@ -315,7 +316,7 @@ msgstr "Tah" msgid "Geometrical Shapes" msgstr "Geometrické tvary" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "Zvětšení" @@ -327,12 +328,16 @@ msgstr "Pomocné linky a mřížka" msgid "Grid Size" msgstr "Velikost mřížky" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "Posunout pracovní plochu" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -351,197 +356,192 @@ msgstr "Zpět" msgid "Insert new points on path" msgstr "Vložit nové body do cesty" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "Vytvářet kvadratické Bézierovy křivky" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "Vytvářet kubické Bézierovy křivky" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles"-msgstr "Kvadratická cesta se dvěma úchopy"+msgstr "Kvadratická cesta s dvouřádkovými identifikátory" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Převést vybrané body" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "Souřadnice x" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "Souřadnice y" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "Otočit" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "Šířka" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "Výška" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Svázat úchopy křivky vybraných bodů úprav" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "Souměrné úchopy" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Převést část na čáru." -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Obrátit cestu" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline"-msgstr ""+msgstr "Změnit velikost předmětu k horní/základní čáře" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path" msgstr "Uzavřít cestu" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 msgid "Move to path to the bottom of the layer" msgstr "Přesunout cestu do spodní vrstvy" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Zrcadlit svisle" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Zrcadlit vodorovně" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "Nastavit velikost obrázku pozadí" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "Ukázat/Skrýt obrázek pozadí" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Vložit nový obrázek pozadí" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "Vysoký kontrast" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "Nastavit práh pro pozadí" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "Podrobnost automatického obkreslení" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "Zjednodušení automatického obkreslení" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "Automaticky obkreslit obrázek pozadí" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "Smazat obrázek pozadí" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "Přidat vrstvu" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "Ukázat vrstvy" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "Použít tah" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Šířka tahu" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "Vytvořit obrys z tahu" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "Nepřesahující konec" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "Zaoblený konec" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "Čtvercový konec" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Zobrazit pomocné linky" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines" msgstr "Ukázat více pomocných linek" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "Zobrazit pomocné linky horního a dolního okraje" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "Zamknout vodítka a mřížku" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "Oddálit více" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "Ukázat celý znak" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "Přizpůsobit velikosti okna" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "Přiblížit na obrázek pozadí" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "Předchozí zobrazení" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Další zobrazení" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Nastavit velikost mřížky"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "Nastavení ukládání" @@ -553,7 +553,7 @@ msgstr "Název souboru" msgid "Units Per Em" msgstr "Jednotky za Em" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "Složka" @@ -561,17 +561,17 @@ msgstr "Složka" msgid "Formats" msgstr "Formáty" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export"-msgstr "Vyvést"+msgstr "Exportovat" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Uložit" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "Abeceda" @@ -610,7 +610,7 @@ msgstr "Složky"  #: libbirdfont/FileTools.vala:31 msgid "New font"-msgstr "Nova fonte"+msgstr "Nový font"  #: libbirdfont/FileTools.vala:37 msgid "Open font"@@ -620,50 +620,50 @@ msgstr "Otevřít písmo" msgid "Save font" msgstr "Uložit písmo" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr "Nastavení"  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "Motivy" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "Horní okraj" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "nahoře" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "výška x" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "účaří" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "dole" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "dolní okraj" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left" msgstr "vlevo" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right" msgstr "vpravo" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "Vodítko" @@ -675,10 +675,6 @@ msgstr "Ukázat mřížku" msgid "Guides" msgstr "Vodítka" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr "Přiblížit"@@ -707,50 +703,44 @@ msgstr "Soubor BF" msgid "SVG-FILES ..." msgstr "Soubory SVG..." -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "neexistuje." -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "Bude vytvořeno nové písmo." -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "Nepodařilo se zavést" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "Ruší se" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "není název znaku nebo hodnota Unicode." -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "Hodnoty Unicode musí začínat na U+." -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "Přidává se" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "do" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "Znak" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Podřezávání" @@ -769,16 +759,16 @@ msgstr "" "Pro podřezání (vyrovnání) znaku mezery stiskněte „mezerník“ a pro podřezání " "(vyrovnání) znaku spojovníku (-) pak klávesu pro „divis“." -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "Unicode" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "Vložit" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Zavřít" @@ -790,16 +780,16 @@ msgstr "Dvojice podřezávání" msgid "No kerning pairs created." msgstr "Nevytvořeny žádné dvojice podřezávání" -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "Třída podřezávání" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Nastavit" @@ -811,51 +801,56 @@ msgstr "Nahrát řetězce podřezávání" msgid "Kerning Tools" msgstr "Nástroje na podřezávání" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "Velikost písma" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "Vytvořit novou třídu podřezávání (vyrovnání)." -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "Zadat hodnoty podřezání (vyrovnání) přímo." -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "Vložit znak z přehledu" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "Vložit znak podle hodnoty Unicode" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "Nejprve otevřít soubor s podřezávacími řetězci." -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "Předchozí podřezávací řetězec" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "Dosáhl jste začátku seznamu." -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "Další podřezávací řetězec " -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "Dosáhl jste konce seznamu." -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions" msgstr "Nahrazení" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "Znakové sady" @@ -863,11 +858,7 @@ msgstr "Znakové sady" msgid "Character Set" msgstr "Znaková sada" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer" msgstr "Vrstva" @@ -908,23 +899,23 @@ msgid "Contextual Substitutions" msgstr "Náhrady vyplývající ze souvislostí"  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "Slitky" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "Začátek" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "Prostředek" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "Konec" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "Slitek" @@ -952,7 +943,7 @@ msgstr "Toto písmo bylo uděláno ve staré verzi Birdfontu." msgid "You need an older version of Birdfont to open it." msgstr "K jeho otevření potřebujete starší verzi Birdfontu." -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Pořadí znaků" @@ -964,7 +955,7 @@ msgstr "Soubor" msgid "New" msgstr "Nový" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files" msgstr "Nedávno otevřené soubory" @@ -1012,8 +1003,8 @@ msgstr "Vybrat všechny znaky" msgid "Move To Baseline" msgstr "Přesunout na účaří" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "Hledat" @@ -1085,106 +1076,98 @@ msgstr "Vyvést písma" msgid "Export Glyph as SVG" msgstr "Vyvést znak jako SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "Zavést soubor SVG" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "Zavést složku SVG" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "Zavést obrázek pozadí" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "Náhled" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 msgid "Tab" msgstr "Karta" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 msgid "Next Tab" msgstr "Další karta" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 msgid "Previous Tab" msgstr "Předchozí karta" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 msgid "Close Tab" msgstr "Zavřít kartu" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs" msgstr "Zavřít všechny karty" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "Rozestupy a podřezávání" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "Ukázat kartu prostrkávání (rozestupů)" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "Ukázat kartu podřezávání (vyrovnání)" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "Vypsat dvojice podřezávání (vyrovnání)" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "Třídy prostrkávání (rozestupů)" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "Vybrat další dvojici podřezávání (vyrovnání)" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "Vybrat předchozí dvojici podřezávání (vyrovnání)" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "Nahrát podřezávací řetězce" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "Nahrát podřezávací řetězce znovu" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "Ukázat slitky" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "Přidat slitek" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "Git" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "Uložit jako BFP" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Přehled" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr "NAHORU"@@ -1218,7 +1201,12 @@ msgstr "Před vyvedením musíte písmo uložit." msgid "Menu" msgstr "Nabídka" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+#, fuzzy+msgid "Can't create TTF font."+msgstr "Criar uma nova fonte"++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "Přidat slitek" @@ -1226,33 +1214,37 @@ msgstr "Přidat slitek" msgid "Move paths" msgstr "Posunout cesty" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "Náhrady znaků" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "Nový znak" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "Nahrazení" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "Značka" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "Název znaku" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "Všechny znaky musí mít jedinečné názvy."  #: libbirdfont/OtfLabel.vala:47 msgid "Stylistic Alternate"-msgstr ""+msgstr "Stylistická alternativa"  #: libbirdfont/OtfLabel.vala:49 msgid "Small Caps"@@ -1266,11 +1258,15 @@ msgstr "Velká písmena na kapitálky" msgid "Swashes" msgstr "Ozdobná písmena" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "Filtr" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr "Žádné znaky v tomto zobrazení."++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "Další podrobnosti:" @@ -1291,59 +1287,62 @@ msgstr "Zrušit" msgid "Yes, don't ask again." msgstr "Ano, tento dotaz již příště nezobrazovat." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "Přeměnit" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "Všechny znaky" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "Výchozí" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "Zkosení" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "Změnit velikost" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "Vytvořit náhražku" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "Nastavit natočení křivky" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size"-msgstr ""+msgstr "Hlavní velikost" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font"-msgstr ""+msgstr "Vytvořit nové hlavní písmo"  #: libbirdfont/OverwriteBfFile.vala:25 msgid "This file already exists. Do you want to replace it?" msgstr ""+"Tento soubor již existuje.\n"+"Přejete si jej nahradit?"  #: libbirdfont/OverwriteBfFile.vala:27 msgid "Replace"-msgstr ""+msgstr "Nahradit"  #: libbirdfont/PenTool.vala:82 msgid "Add new points" msgstr "Přidat nové body" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "Posunout ovládací body" @@ -1359,19 +1358,19 @@ msgstr "Vyvést písma" msgid "Generate html document" msgstr "Vytvořit soubor HTML" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "Ještě nevytvořena žádná písma" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "Vytvořit nové písmo" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 msgid "Glyphs" msgstr "Znaky" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 msgid "Backups" msgstr "Zálohy" @@ -1395,43 +1394,48 @@ msgstr "Zahodit" msgid "Save?" msgstr "Uložit?" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "Přesnost pro nástroj psacího pera" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "Ukázat nebo skrýt úchopy ovládacích bodů" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "Vyplnit otevřené cesty." -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "Použít jednotky TTF." -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "Počet bodů přidávaných nástrojem kreslení od ruky" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "Práh pro zjednodušení cesty" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "Nepřekládat"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "Téma barev" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "Přiřazení klávesových zkratek" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "Znak" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "Nová třída prostrkávání (rozestupů)" @@ -1443,287 +1447,291 @@ msgstr "Rozestupy" msgid "Left" msgstr "Vlevo" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "Vpravo" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "Zavést"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "Pozadí plátna" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "Vyplněný obrys" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "Barva tahu" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "Barva úchopu" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "Barva výplně" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "Vybrané objekty" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "Pozadí 1" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "Pozadí dialogu" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "Pozadí nabídky" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "Výchozí pozadí" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "Pozadí zaškrtávacího okénka" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "Popředí 1" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "Popředí textu" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "Okraj tabulky" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "Okraj výběru" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "Přehledový znak" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "Popředí obráceno" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "Popředí nabídky" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "Popředí vybrané karty" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "Oddělovač karty" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "Zvýrazněno 1" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "Zvýrazněné vodítko" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "Mřížka" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "Vodítko 1" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "Vodítko 2" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "Vodítko 3" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "Okraj tlačítka 1" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "Pozadí tlačítka 1" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "Okraj tlačítka 2" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "Pozadí tlačítka 2" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "Okraj tlačítka 3" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "Pozadí tlačítka 3" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "Okraj tlačítka 4" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "Pozadí tlačítka 4" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "Popředí tlačítka" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "Popředí vybraného tlačítka" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "Popředí nástroje" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "Popředí vybraného nástroje" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "Pozadí textové oblasti" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "Okraj přehledové položky" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "Položka vybraného přehledu" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "Položka přehledu 1" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "Položka přehledu 2" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "Popředí vybraného přehledu" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "Popředí přehledu" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "Pozadí počtu znaků 1" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "Pozadí počtu znaků 2" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "Stín dialogu" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "Vybraný činný krychlový ovládací bod" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "Vybraný krychlový ovládací bod" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "Činný krychlový ovládací bod" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "Krychlový ovládací bod" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "Vybraný činný čtvercový ovládací bod" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "Vybraný čtvercový ovládací bod" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "Činný čtvercový ovládací bod" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "Krychlový čtvercový bod " -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "Vybraný úchop ovládacího bodu" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "Činný úchop" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "Úchop ovládacího bodu" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "Sloučit" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "Kruhové tlačítko" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "Činné kruhové tlačítko" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "Okraj zvětšovacího pruhu" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "Název písma" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "Nový motiv" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "Přidat nový motiv" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "Barvy" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "Tmavé" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "Světlé" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "Vlastní" @@ -1731,7 +1739,7 @@ msgstr "Vlastní" msgid "Color" msgstr "Barva" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "Posun" @@ -1743,7 +1751,7 @@ msgstr "Kreslení od ruky" msgid "New version" msgstr "Nová verze" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "Písma byla uložena." @@ -1775,11 +1783,8 @@ msgstr "Neznámý formát souboru." msgid "Writing" msgstr "Zapisuje se" -#~ msgid "No glyphs in this view."-#~ msgstr "Žádné znaky v tomto zobrazení."--#~ msgid "Import"-#~ msgstr "Zavést"+#~ msgid "color"+#~ msgstr "Barva"  #~ msgid "Full name (name and style)" #~ msgstr "Celý název (název a styl)"@@ -2227,9 +2232,6 @@ msgstr "Zapisuje se" #~ msgid "Update name & description" #~ msgstr "Atualizar nome e descrição" -#~ msgid "Create a new font"-#~ msgstr "Criar uma nova fonte"- #~ msgid "Add name and description to this font." #~ msgstr "Adicionar nome e descrição para esta fonte." diff --git a/po/de.po b/po/de.poindex 09b6224..e938877 100644--- a/po/de.po+++ b/po/de.po@@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-12-26 00:03+0000\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2016-11-23 08:49+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: de\n"@@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1451088214.000000\n"+"X-POOTLE-MTIME: 1479890962.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"@@ -25,12 +25,12 @@ msgstr "Verwendung" #: libbirdfont/Argument.vala:279 libbirdfont/ExportUtils.vala:19 #: birdfont-autotrace/AutoTrace.vala:68 msgid "FILE"-msgstr "Datei"+msgstr "Dateien"  #: libbirdfont/Argument.vala:279 libbirdfont/ExportUtils.vala:19 #: birdfont-autotrace/AutoTrace.vala:68 msgid "OPTION"-msgstr "Option"+msgstr "Alternative"  #: libbirdfont/Argument.vala:281 msgid "enable Android customizations"@@ -84,11 +84,16 @@ msgstr "Hintergrundbild auswählen" msgid "Background Image" msgstr "Hintergrundbild" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Verschiebe, skaliere und rotiere das Hintergrundbild" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr "auf der Achse"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Hintergrundbild auswählen" @@ -97,7 +102,7 @@ msgid "Images" msgstr "Bilder"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Dateien" @@ -105,16 +110,16 @@ msgstr "Dateien" msgid "Parts" msgstr "Teile" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Hinzufügen" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "Glyphe auswählen" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Öffnen"@@ -131,10 +136,6 @@ msgstr "Linie" msgid "corner" msgstr "Ecken" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr "auf der Achse"- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "Kreis"@@ -188,18 +189,18 @@ msgid "Thai" msgstr "Thai"  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "a ä b c d e f g h i j k l m n o ö p q r s ß t u ü v w x y z"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"-msgstr "A Ä B C D E F G H I J K L M O Ö P Q R S T U Ü V W X Y Z"+msgstr "A Ä B C D E F G H I J K L M N O Ö P Q R S T U Ü V W X Y Z"  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description" msgstr "Name und Beschreibung" @@ -208,7 +209,7 @@ msgid "PostScript Name" msgstr "PostScript Name"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Name" @@ -236,9 +237,9 @@ msgstr "Vollständiger Name (Name und Schriftstil)" msgid "Unique Identifier" msgstr "Eindeutige Kennung" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Version" @@ -310,7 +311,7 @@ msgstr "Kontur" msgid "Geometrical Shapes" msgstr "Geometrische Formen" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "Betrachtungsabstand" @@ -322,12 +323,16 @@ msgstr "Leitlinien & Gitter" msgid "Grid Size" msgstr "Gittergröße" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "Arbeitsfläche verschieben" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -346,198 +351,193 @@ msgstr "Rückgängig" msgid "Insert new points on path" msgstr "Füge zusätzliche Punkte im Linienzug Pfad ein" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "Erstelle quadratische Bézierkurven" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "Erstelle kubische Bézierkurven" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "Quadratischer Pfad mit zwei Griffpunkten" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Ausgewählte Punkte umwandeln" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "X-Koordinate" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "Y-Koordinate" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "Drehen" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "Breite" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "Höhe" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Verbinde Griffpunkte der ausgewählten Ankerpunkte"  # ist Ankerpunkt das richtige Wort?-#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "Symmetrische Griffpunkte" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Segment zur Linie umwandeln." -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Kontur invertieren" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "Skaliere das Objekt zum oberen Schriftrand/Basislinie" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path" msgstr "Pfad schließen" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 msgid "Move to path to the bottom of the layer" msgstr "Verschiebe Pfad auf die unterste Ebene" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Pfad vertikal spiegeln" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Pfad horizontal spiegeln" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "Hintergrundbildgröße festlegen" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "Hintergrundbild anzeigen/ausblenden" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Neues Hintergrundbild einfügen" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "Hoher Kontrast" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "Hintergrund-Grenzwert einstellen" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "Menge der Nachzeichen-Details" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "Autoverfolgungs-Vereinfachung" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "Hintergrundbild Nachzeichnen" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "Hintergrundbild löschen" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "Ebene hinzufügen" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "Ebenen anzeigen" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "Kontur anwenden" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Breite der Kontur" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "Außenlinie von Kontur erstellen" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "Stumpfes Linienende" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "Abgerundetes Linienende" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "Eckiges Ende" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Hilfslinien anzeigen" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines" msgstr "mehr Hilfslinien anzeigen" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "Hilfslinien am oberen und unteren Rand anzeigen" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "Hilfslinien und Gitter sperren" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "Mehr hinauszoomen" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "Gesamte Glyphe anzeigen" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "Ansicht einpassen" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "Ansicht auf Hintergrundbild vergrößern" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "Vorherige Ansicht" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Nächste Ansicht" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Rastergröße einstellen"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "Einstellungen exportieren" @@ -549,7 +549,7 @@ msgstr "Dateiname" msgid "Units Per Em" msgstr "Einheiten pro EM" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "Ordner" @@ -557,17 +557,17 @@ msgstr "Ordner" msgid "Formats" msgstr "Formate" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "Export" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Speichern" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "Alphabet" @@ -616,50 +616,50 @@ msgstr "Schrift öffnen" msgid "Save font" msgstr "Schrift speichern" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr "Einstellungen"  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "Designs" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "oberer Rand" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "oben" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "X-Höhe" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "Grundlinie" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "unten" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "Unterer Rand" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left" msgstr "links" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right" msgstr "rechts" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "Anleitung" @@ -671,10 +671,6 @@ msgstr "Raster anzeigen" msgid "Guides" msgstr "Anleitungen" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr "Ansicht vergrößern"@@ -703,50 +699,44 @@ msgstr "BF-Datei" msgid "SVG-FILES ..." msgstr "SVG-Dateien" -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "existiert nicht." -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "Ein neuer Zeichensatz wird erstellt." -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "Importieren fehlgeschlagen" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "abbrechen" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "ist nicht der Name einer Glyphe oder eines Unicode Wertes." -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "Unicode Werte müssen mit U+ anfangen." -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "Füge hinzu" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "zu" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "Glyphe" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Unterschneidung" @@ -765,16 +755,16 @@ msgstr "" "Zum unterschneiden des Leerzeichens die \"Leertaste\" drücken, für den " "Bindestrich die \"-\" Taste." -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "Unicode" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "Einfügen" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Schließen" @@ -786,16 +776,16 @@ msgstr "Unterschneidungs-Paare" msgid "No kerning pairs created." msgstr "Es wurden keine Unterschneidungs-Paare erstellt." -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "Unterschneidungs-Klasse" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Übernehmen" @@ -807,51 +797,56 @@ msgstr "Unterschneidungs-Daten laden" msgid "Kerning Tools" msgstr "Unterschneidungs-Werkzeuge" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "Schriftgröße" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "Neue Unterschneidungs-Klasse erstellen." -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "Verwende Texteingabe für Unterschneidungs-Werte." -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "Glyphe aus Übersicht einfügen" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "Zeichen anhand Unicode-Wert einfügen" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "Zuerst Textdatei mit Unterschneidungs-Daten öffnen." -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "Vorherige Unterschneidungs-Daten" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "Sie haben den Anfang der Liste erreicht." -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "Nächste Unterschneidungs-Daten" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "Sie haben das Ende der Liste erreicht." -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions" msgstr "Ersetzungen" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "Zeichensätze" @@ -859,11 +854,7 @@ msgstr "Zeichensätze" msgid "Character Set" msgstr "Zeichensatz" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer" msgstr "Ebene" @@ -904,23 +895,23 @@ msgid "Contextual Substitutions" msgstr "Kontextabhängiger Ersatz"  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "Ligaturen" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "Anfang" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "Zentriert" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "Ende" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "Ligatur" @@ -949,7 +940,7 @@ msgstr "Diese Schriftart wurde mit einer alten Version von Birdfont erstellt." msgid "You need an older version of Birdfont to open it." msgstr "Sie brauchen eine ältere Version von Birdfont zum Öffnen" -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Glyphenfolge" @@ -961,7 +952,7 @@ msgstr "Datei" msgid "New" msgstr "Neu" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files" msgstr "Zuletzt geöffnete Dateien" @@ -1009,8 +1000,8 @@ msgstr "Alle Glyphen auswählen" msgid "Move To Baseline" msgstr "Verschiebe auf Grundlinie" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "Suchen" @@ -1082,107 +1073,99 @@ msgstr "Schrift exportieren" msgid "Export Glyph as SVG" msgstr "Glyphe als SVG exportieren" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "SVG-Datei importieren" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "SVG Verzeichnis importieren" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr "Farbe"--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "Hintergrundbild importieren" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "Vorschau" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 msgid "Tab" msgstr "Tab" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 msgid "Next Tab" msgstr "Nächster Tab" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 msgid "Previous Tab" msgstr "Vorheriger Tab" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 msgid "Close Tab" msgstr "Tab schließen" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs" msgstr "Alle Tabs schließen" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "Sperren und Unterschneidung" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "Zeige Tab für Zeichenabstand" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "Tab für Unterschneidungen anzeigen" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "Unterschneidungspaare auflisten"  # sounds better-#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "Zeichenabstands-Klassen" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "Nächstes Unterschneidungspaar auswählen" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "Vorheriges Unterschneidungspaar auswählen" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "Unterschneidungsdaten laden" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "Unterschneidungsdaten erneut laden" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "Ligaturen anzeigen" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "Ligatur hinzufügen" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "Git" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "Als .bfp speichern" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Übersicht" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr "Nach oben"@@ -1217,7 +1200,12 @@ msgstr "" msgid "Menu" msgstr "Menü" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+#, fuzzy+msgid "Can't create TTF font."+msgstr "Criar uma nova fonte"++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "Ligatur hinzufügen" @@ -1225,27 +1213,31 @@ msgstr "Ligatur hinzufügen" msgid "Move paths" msgstr "Pfade verschieben" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "Glyphenersetzungen" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "Neue Glyphe" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "Ersetzung" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "Tag" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "Glyphenname" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "Alle Glyphen müssen eindeutige Namen haben." @@ -1265,11 +1257,15 @@ msgstr "Großbuchstaben zu Kapitälchen" msgid "Swashes" msgstr "Zierschriften" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "Filter" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr "Keine Zeichen in dieser Ansicht."++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "Siehe auch:" @@ -1290,43 +1286,44 @@ msgstr "Abbrechen" msgid "Yes, don't ask again." msgstr "Ja, nicht mehr Fragen." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "Umwandeln" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master"-msgstr ""+msgstr "Multi-Master" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "Alle Glyphen" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "Standard" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "Kippen" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "Größe ändern" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "Ersatz anlegen" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "Kurvenausrichtung einstellen" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "Hauptgröße" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "Erstelle neue Hauptschrift" @@ -1344,7 +1341,7 @@ msgstr "Ersetzen" msgid "Add new points" msgstr "Neue Punkte hinzufügen" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "Ankerpunkte verschieben" @@ -1360,19 +1357,19 @@ msgstr "Schriftarten exportieren" msgid "Generate html document" msgstr "HTML-Dokument erzeugen" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "Noch keine Schriftarten erstellt" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "Neue Schriftart erstellen" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 msgid "Glyphs" msgstr "Glyphen" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 msgid "Backups" msgstr "Sicherungskopien" @@ -1396,43 +1393,48 @@ msgstr "Verwerfen" msgid "Save?" msgstr "Speichern?" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "Genauigkeit des Stift-Werkzeugs" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "Ankerpunktgriffe anzeigen oder ausblenden" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "Fülle offene Pfade." -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "Benutze TTF-Einheiten." -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "Vom Freihandwerkzeug hinzugefügte Anzahl an Punkten" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "Pfadvereinfachungs-Schwellenwert" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "nicht übersetzen"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "Farbschema" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "Tastaturkürzel" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "Zeichen" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "Neue Zeichenabstands-Klasse" @@ -1444,293 +1446,291 @@ msgstr "Zeichenabstand" msgid "Left" msgstr "Links" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "Rechts" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "Importieren"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "Zeichenflächen-Hintergrund" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "Kontur füllen" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "Konturfarbe" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "Grifffarbe" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "Füllfarbe" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "Gewählte Objekte" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "Hintergrund 1" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "Dialog-Hintergrund" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "Menü-Hintergrund" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "Voreingestellter Hintergrund" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "Dialogfeld-Hintergrund" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "Vordergrund 1" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "Textvordergrund" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "Tabellenrand" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "Auswahlrand" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "Glyphen Übersicht" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "Vordergrund invertiert" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "Menü-Vordergrund" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "Ausgewählter Tab-Vordergrund" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "Tab-Trenner" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "Hervorgehoben 1" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "Hervorgehobene Hilfslinie" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "Raster" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "Hilfslinie 1" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "Hilfslinie 2" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "Hilfslinie 3" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "Schaltflächenrand 1" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "Schaltflächen-Hintergrund 1" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "Schaltflächenrand 2" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "Schaltflächen-Hintergrund 2" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "Schaltflächenrand 3" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "Schaltflächen-Hintergrund 3" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "Schaltflächenumrandung 4" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "Schaltflächen-Hintergrund 4" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "Schaltflächen-Vordergrund" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "Ausgewähler Schaltflächen-Vordergrund" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "Werkzeug-Vordergrund" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "Ausgewählter Werkzeug-Vordergrund" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "Schriftflächen-Vordergrund" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "Übersicht des Element-Randes" -#: libbirdfont/Theme.vala:473-#, fuzzy+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item"-msgstr "Ausgewähles Überblicks-Werkzeug"+msgstr "Ausgewähles Übersichts-Werkzeug" -#: libbirdfont/Theme.vala:474-#, fuzzy+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1"-msgstr "Übersichts-Werkzeug 1"+msgstr "Element Übersicht 1" -#: libbirdfont/Theme.vala:475-#, fuzzy+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2"-msgstr "Übersichts-Werkzeug 2"+msgstr "Element Übersicht 2" -#: libbirdfont/Theme.vala:477-#, fuzzy+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground"-msgstr "Ausgewählten Vordergrund ansehen"+msgstr "Übersicht im Vordergrund ansehen" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "Vordergrunds-Ansicht" -#: libbirdfont/Theme.vala:480-#, fuzzy+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1"-msgstr "Glyphen Hintergrund-Zähler 1"+msgstr "Glyphen-Zähler Hintergrund 1" -#: libbirdfont/Theme.vala:481-#, fuzzy+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2"-msgstr "Glyphen Hintergrund-Zähler 2"+msgstr "Glyphen-Zähler Hintergrund 2" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "Dialogfenster-Schatten" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "Ausgewählter aktiver kubischer Ankerpunkt" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "Ausgewählter kubischer Ankerpunkt" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "Aktiver kubischer Ankerpunkt" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "Kubischer Ankerpunkt" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "Ausgewählter aktiver quadratischer Ankerpunkt" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "Ausgewählter quadratischer Ankerpunkt" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "Aktiver quadratischer Ankerpunkt" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "Kubisch-quadratischer Ankerpunkt" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "Ausgewählte Griffpunkte" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "Aktive Griffpunkte" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "Ankerpunktgriff" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "Zusammenführen" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "Drehpunkt" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "Aktiver Drehpunkt" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "Vergrößerungsleisten-Rand" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "Schriftname" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "Neues Design" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "Neues Design hinzufügen" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "Farben" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "Dunkel" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "Hell" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "Benutzerdefiniert" @@ -1738,7 +1738,7 @@ msgstr "Benutzerdefiniert" msgid "Color" msgstr "Farben" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "Verschieben" @@ -1750,7 +1750,7 @@ msgstr "Freihändig zeichnen" msgid "New version" msgstr "Neue Version" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "Die Schriftart wurde exportiert." @@ -1782,11 +1782,8 @@ msgstr "Unbekanntes Dateiformat." msgid "Writing" msgstr "Wird geschrieben..." -#~ msgid "No glyphs in this view."-#~ msgstr "Keine Zeichen in dieser Ansicht."--#~ msgid "Import"-#~ msgstr "Importieren"+#~ msgid "color"+#~ msgstr "Farbe"  #~ msgid "Full name (name and style)" #~ msgstr "Vollständiger Name (Name und Schriftstil)"@@ -2173,9 +2170,6 @@ msgstr "Wird geschrieben..." #~ msgid "Update name & description" #~ msgstr "Atualizar nome e descrição" -#~ msgid "Create a new font"-#~ msgstr "Criar uma nova fonte"- #~ msgid "Add name and description to this font." #~ msgstr "Adicionar nome e descrição para esta fonte." diff --git a/po/el.po b/po/el.poindex 23ee0b1..28e6073 100644--- a/po/el.po+++ b/po/el.po@@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2014-08-28 18:37+0000\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2017-03-24 22:09+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: el\n"@@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1409251048.000000\n"+"X-POOTLE-MTIME: 1490393397.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"@@ -62,7 +62,7 @@ msgstr "ενεργοποίηση προσαρμογών Macintosh"  #: libbirdfont/Argument.vala:288 msgid "enable Windows customizations"-msgstr ""+msgstr "ενεργοποίηση παραμετροποιήσεων για Windows"  #: libbirdfont/Argument.vala:289 msgid "don't translate"@@ -78,62 +78,63 @@ msgstr "εκτέλεση δοκιμής"  #: libbirdfont/BackgroundSelectionTool.vala:23 msgid "Select background"-msgstr ""+msgstr "Επιλογή παρασκηνίου"  #: libbirdfont/BackgroundTab.vala:47 libbirdfont/BackgroundTools.vala:26 msgid "Background Image"-msgstr ""+msgstr "Εικόνα Παρασκηνίου" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Μετακίνηση, αλλαγή μεγέθους και περιστροφή εικόνας φόντου" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr "στον άξονα"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image"-msgstr ""+msgstr "Επιλέξτε εικόνα παρασκηνίου"  #: libbirdfont/BackgroundTools.vala:27 msgid "Images"-msgstr ""+msgstr "Εικόνες"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Αρχεία"  #: libbirdfont/BackgroundTools.vala:38 msgid "Parts"-msgstr ""+msgstr "Μέρη" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add"-msgstr ""+msgstr "Προσθέτω" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph"-msgstr ""+msgstr "Επιλογή Ανάγλυφου" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Άνοιγμα"  #: libbirdfont/BezierTool.vala:91 msgid "Create Beziér curves"-msgstr ""+msgstr "Δημιουργία καμπυλών bezier"  #: libbirdfont/BezierTool.vala:95 msgid "line"-msgstr ""+msgstr "γραμμή"  #: libbirdfont/BezierTool.vala:99 msgid "corner"-msgstr ""--#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr ""+msgstr "γωνία"  #: libbirdfont/CircleTool.vala:36 msgid "Circle"@@ -145,12 +146,14 @@ msgid "Crop background image" msgstr "Περικοπή εικόνας φόντου"  #: libbirdfont/DefaultCharactersSet.vala:25+#, fuzzy msgid "Default Language"-msgstr ""+msgstr "Προεπιλεγμένη γλώσσα"  #: libbirdfont/DefaultCharactersSet.vala:26+#, fuzzy msgid "Private Use Area"-msgstr ""+msgstr "Περιοχή ιδιωτικής χρήσης"  #: libbirdfont/DefaultCharactersSet.vala:28 msgid "Chinese"@@ -174,7 +177,7 @@ msgstr "Ιάβας"  #: libbirdfont/DefaultCharactersSet.vala:33 msgid "Latin"-msgstr ""+msgstr "Λατινικά"  #: libbirdfont/DefaultCharactersSet.vala:34 msgid "Russian"@@ -189,28 +192,28 @@ msgid "Thai" msgstr ""  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr "Α Β Γ Δ Ε Ζ Η Θ Ι Κ Λ Μ Ν Ξ Ο Π Ρ Σ Τ Υ Φ Χ Ψ Ω"  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description"-msgstr ""+msgstr "Όνομα και Περιγραφή"  #: libbirdfont/DescriptionDisplay.vala:70 libbirdfont/MenuTab.vala:98 #, fuzzy msgid "PostScript Name"-msgstr "Ονομασία αρχείου Postscript"+msgstr "Ονομασία Postscript"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Όνομα" @@ -231,16 +234,18 @@ msgid "Weight" msgstr "Βάρος"  #: libbirdfont/DescriptionDisplay.vala:129 libbirdfont/MenuTab.vala:113+#, fuzzy msgid "Full Name (Name and Style)"-msgstr ""+msgstr "Πλήρης ονομασία (όνομα και στυλ)"  #: libbirdfont/DescriptionDisplay.vala:140 libbirdfont/MenuTab.vala:118+#, fuzzy msgid "Unique Identifier"-msgstr ""+msgstr "Μοναδικό αναγνωριστικό" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Έκδοση" @@ -254,7 +259,7 @@ msgstr "Πνευματικά δικαιώματα"  #: libbirdfont/DescriptionDisplay.vala:183 msgid "License"-msgstr ""+msgstr "Άδεια χρήσης"  #: libbirdfont/DescriptionDisplay.vala:195 msgid "License URL"@@ -262,39 +267,39 @@ msgstr ""  #: libbirdfont/DescriptionDisplay.vala:207 msgid "Trademark"-msgstr ""+msgstr "Εμπορικό σήμα"  #: libbirdfont/DescriptionDisplay.vala:219 msgid "Manufacturer"-msgstr ""+msgstr "Κατασκευαστής"  #: libbirdfont/DescriptionDisplay.vala:230 msgid "Designer"-msgstr ""+msgstr "Σχεδιαστής"  #: libbirdfont/DescriptionDisplay.vala:241 msgid "Vendor URL"-msgstr ""+msgstr "URL πωλητή"  #: libbirdfont/DescriptionDisplay.vala:252 msgid "Designer URL"-msgstr ""+msgstr "URL σχεδιαστή"  #: libbirdfont/DrawingTools.vala:112 msgid "Background Tools"-msgstr ""+msgstr "Εργαλεία φόντου"  #: libbirdfont/DrawingTools.vala:113 msgid "Control Points"-msgstr ""+msgstr "Σημεία ελέγχου"  #: libbirdfont/DrawingTools.vala:114 msgid "Object Tools"-msgstr ""+msgstr "Εργαλεία αντικειμένων"  #: libbirdfont/DrawingTools.vala:123 msgid "Drawing Tools"-msgstr ""+msgstr "Εργαλεία σχεδίασης"  #: libbirdfont/DrawingTools.vala:124 msgid "Control Point"@@ -310,11 +315,11 @@ msgstr ""  #: libbirdfont/DrawingTools.vala:128 msgid "Geometrical Shapes"-msgstr ""+msgstr "Γεωμετρικά σχήματα" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom"-msgstr ""+msgstr "Εστίαση"  #: libbirdfont/DrawingTools.vala:130 msgid "Guidelines & Grid"@@ -324,17 +329,21 @@ msgstr "" msgid "Grid Size" msgstr "" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204 msgid "Delete"-msgstr ""+msgstr "Διαγραφή"  #: libbirdfont/DrawingTools.vala:211 msgid "Select all points or paths"@@ -343,207 +352,204 @@ msgstr "" #: libbirdfont/DrawingTools.vala:227 libbirdfont/Menu.vala:99 #, fuzzy msgid "Undo"-msgstr "_Αναίρεση"+msgstr "Αναίρεση"  #: libbirdfont/DrawingTools.vala:234 msgid "Insert new points on path" msgstr "" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 #, fuzzy msgid "Create quadratic Bézier curves" msgstr "Δημιουργία καμπύλων Bézier" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 #, fuzzy msgid "Create cubic Bézier curves" msgstr "Δημιουργία καμπύλων Bézier" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Μετατροπή επιλεγμένων σημείων" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 #, fuzzy msgid "Height" msgstr "Βάρος" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Μετατροπή τμήματος σε γραμμή." -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Δημιουργία κοίλου από περίγραμμα" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path" msgstr "" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598+#, fuzzy msgid "Move to path to the bottom of the layer"-msgstr ""+msgstr "Μετακίνηση μονοπατιού στο κατώτατο στρώμα [επίπεδο]" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Κατακόρυφη αναστροφή μονοπατιού" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Οριζόντια αναστροφή μονοπατιού" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "Επιλογή μεγέθους εικόνας φόντου" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "Εμφάνιση/απόκρυψη εικόνας φόντου" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Εισαγωγή νέας εικόνας φόντου" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Πάχος πινελιάς" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Εμφάνιση οδηγών" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004+#, fuzzy msgid "Show more guidelines"-msgstr ""+msgstr "Εμφάνιση οδηγών" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 #, fuzzy msgid "Zoom in on background image" msgstr "Ξάκρισμα εικόνας φόντου" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "Προηγούμενη προβολή" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Επόμενη προβολή" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr ""  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "" @@ -555,7 +561,7 @@ msgstr "" msgid "Units Per Em" msgstr "" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "" @@ -563,17 +569,17 @@ msgstr "" msgid "Formats" msgstr "" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Αποθήκευση" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "" @@ -583,20 +589,24 @@ msgid "Usage:" msgstr "Χρήση:"  #: libbirdfont/ExportUtils.vala:20 birdfont-autotrace/AutoTrace.vala:71+#, fuzzy msgid "print this message"-msgstr ""+msgstr "εκτύπωση μηνύματος\n"  #: libbirdfont/ExportUtils.vala:21+#, fuzzy msgid "write files to this directory"-msgstr ""+msgstr "εγγραφή αρχείων στον κατάλογο\n"  #: libbirdfont/ExportUtils.vala:22+#, fuzzy msgid "write svg file"-msgstr ""+msgstr "εγγραφή svg αρχείου\n"  #: libbirdfont/ExportUtils.vala:23+#, fuzzy msgid "write ttf and eot file"-msgstr ""+msgstr "εγγραφή ttf και eot αρχείων\n"  #: libbirdfont/ExportUtils.vala:130 #, fuzzy@@ -623,50 +633,50 @@ msgstr "" msgid "Save font" msgstr "" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr ""  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left" msgstr "" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right" msgstr "" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "" @@ -678,10 +688,6 @@ msgstr "Προβολή πλέγματος" msgid "Guides" msgstr "" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr ""@@ -710,50 +716,44 @@ msgstr "" msgid "SVG-FILES ..." msgstr "" -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "" -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "" -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "" -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "" -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Διαστοιχείωση" @@ -770,16 +770,16 @@ msgstr "" msgid "Type “space” to kern the space character and “divis” to kern -." msgstr "" -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Τερματισμός" @@ -791,16 +791,16 @@ msgstr "" msgid "No kerning pairs created." msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "" @@ -812,51 +812,56 @@ msgstr "" msgid "Kerning Tools" msgstr "" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "" -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "" -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "" -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "" -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions" msgstr "" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "" @@ -864,11 +869,7 @@ msgstr "" msgid "Character Set" msgstr "" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer" msgstr "" @@ -909,23 +910,23 @@ msgid "Contextual Substitutions" msgstr ""  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "" @@ -934,8 +935,9 @@ msgid "Position" msgstr ""  #: libbirdfont/Line.vala:157+#, fuzzy msgid "Move"-msgstr ""+msgstr "_Μετακίνηση"  #: libbirdfont/LoadCallback.vala:29 msgid "This font was made with a newer version of Birdfont."@@ -953,21 +955,24 @@ msgstr "" msgid "You need an older version of Birdfont to open it." msgstr "" -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Ακολουθία γλύφων"  #: libbirdfont/Menu.vala:37+#, fuzzy msgid "File"-msgstr ""+msgstr "Αρχεία"  #: libbirdfont/Menu.vala:43+#, fuzzy msgid "New"-msgstr ""+msgstr "_Νέο" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85+#, fuzzy msgid "Recent Files"-msgstr ""+msgstr "Πρόσφατα αρχεία"  #: libbirdfont/Menu.vala:71 msgid "Save As"@@ -978,43 +983,50 @@ msgid "Select Character Set" msgstr ""  #: libbirdfont/Menu.vala:85+#, fuzzy msgid "Quit"-msgstr ""+msgstr "_Έξοδος"  #: libbirdfont/Menu.vala:93+#, fuzzy msgid "Edit"-msgstr ""+msgstr "_Επεξεργασία"  #: libbirdfont/Menu.vala:106 msgid "Redo" msgstr ""  #: libbirdfont/Menu.vala:113+#, fuzzy msgid "Copy"-msgstr ""+msgstr "_Αντιγραφή"  #: libbirdfont/Menu.vala:120+#, fuzzy msgid "Paste"-msgstr ""+msgstr "_Επικόλληση"  #: libbirdfont/Menu.vala:127+#, fuzzy msgid "Paste In Place"-msgstr ""+msgstr "Επικόλληση _επί τόπου"  #: libbirdfont/Menu.vala:134+#, fuzzy msgid "Select All Paths"-msgstr ""+msgstr "Επιλογή όλων των μονοπατιών"  #: libbirdfont/Menu.vala:141+#, fuzzy msgid "Select All Glyphs"-msgstr ""+msgstr "Επιλογή όλων των μονοπατιών"  #: libbirdfont/Menu.vala:148 msgid "Move To Baseline" msgstr "" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "Αναζήτηση" @@ -1031,8 +1043,9 @@ msgid "Close Path" msgstr ""  #: libbirdfont/Menu.vala:183+#, fuzzy msgid "Glyph Sequence"-msgstr ""+msgstr "Ακολουθία γλύφων"  #: libbirdfont/Menu.vala:190 msgid "Set Background Glyph"@@ -1083,109 +1096,108 @@ msgid "Export Fonts" msgstr ""  #: libbirdfont/Menu.vala:281+#, fuzzy msgid "Export Glyph as SVG"-msgstr ""+msgstr "_Εξαγωγή Γλύφου ως SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324+#, fuzzy msgid "Tab"-msgstr ""+msgstr "_Καρτέλα" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 msgid "Next Tab" msgstr "" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337+#, fuzzy msgid "Previous Tab"-msgstr ""+msgstr "_Προηγούμενη καρτέλα" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344+#, fuzzy msgid "Close Tab"-msgstr ""+msgstr "_Κλείσιμο καρτέλας" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351+#, fuzzy msgid "Close All Tabs"-msgstr ""+msgstr "Κλείσιμο όλων των καρτελών" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393+#, fuzzy msgid "Select Next Kerning Pair"-msgstr ""+msgstr "Επιλογή _Επόμενου ζεύγους διαστοιχείωσης" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407+#, fuzzy msgid "Select Previous Kerning Pair"-msgstr ""+msgstr "Επιλογή _Προηγούμενο ζεύγους διαστοιχείωσης" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Επισκόπηση" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr ""@@ -1219,7 +1231,11 @@ msgstr "" msgid "Menu" msgstr "Κατάλογος" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+msgid "Can't create TTF font."+msgstr ""++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "" @@ -1228,27 +1244,31 @@ msgstr "" msgid "Move paths" msgstr "Μετακίνηση μονοπατιού" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "" @@ -1268,11 +1288,15 @@ msgstr "" msgid "Swashes" msgstr "" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "Φίλτρο" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr ""++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "" @@ -1293,43 +1317,44 @@ msgstr "" msgid "Yes, don't ask again." msgstr "" -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "" @@ -1345,7 +1370,7 @@ msgstr "" msgid "Add new points" msgstr "" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "" @@ -1361,21 +1386,22 @@ msgstr "" msgid "Generate html document" msgstr "" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 msgid "Glyphs" msgstr "" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96+#, fuzzy msgid "Backups"-msgstr ""+msgstr "Αντίγραφο ασφαλείας"  #: libbirdfont/RectangleTool.vala:30 msgid "Rectangle"@@ -1397,43 +1423,48 @@ msgstr "Απόρριψη" msgid "Save?" msgstr "Αποθήκευση;" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "" -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "" -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "να μη μεταφραστεί"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "" @@ -1445,287 +1476,292 @@ msgstr "" msgid "Left" msgstr "" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "Εισαγωγή"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421+#, fuzzy msgid "Stroke Color"-msgstr ""+msgstr "Χρώμα πινελιάς" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "" @@ -1733,7 +1769,7 @@ msgstr "" msgid "Color" msgstr "" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "" @@ -1745,7 +1781,7 @@ msgstr "" msgid "New version" msgstr "Νέα έκδοση" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "" @@ -1777,9 +1813,6 @@ msgstr "" msgid "Writing" msgstr "" -#~ msgid "Import"-#~ msgstr "Εισαγωγή"- #~ msgid "Full name (name and style)" #~ msgstr "Πλήρης ονομασία (όνομα και στυλ)" diff --git a/po/es.po b/po/es.poindex ff3454b..ff434f8 100644--- a/po/es.po+++ b/po/es.po@@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-12-16 18:17+0000\n"-"Last-Translator: Anonymous Pootle User\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2017-03-29 18:30+0000\n"+"Last-Translator: Idapm <i.pineda.marrero@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: es\n" "MIME-Version: 1.0\n"@@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1450289869.000000\n"+"X-POOTLE-MTIME: 1490812206.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"@@ -84,11 +84,16 @@ msgstr "Seleccione el fondo" msgid "Background Image" msgstr "Imagen de fondo" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Mover, redimensionar y girar la imagen de fondo" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr "en eje"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Seleccionar una imagen de fondo" @@ -97,7 +102,7 @@ msgid "Images" msgstr "Imágenes"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Archivos" @@ -105,16 +110,16 @@ msgstr "Archivos" msgid "Parts" msgstr "Partes" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Agregar" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "Seleccionar glifo" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Abrir"@@ -131,10 +136,6 @@ msgstr "línea" msgid "corner" msgstr "esquina" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr "en eje"- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "Círculo"@@ -149,7 +150,7 @@ msgstr "Idioma predeterminado"  #: libbirdfont/DefaultCharactersSet.vala:26 msgid "Private Use Area"-msgstr "Área de uso privado"+msgstr "Área de uso privado"  #: libbirdfont/DefaultCharactersSet.vala:28 msgid "Chinese"@@ -188,27 +189,27 @@ msgid "Thai" msgstr "Tailandés"  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "a b c d e f g h i j k l m n ñ o p q r s t u v w x y z"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"-msgstr "A B C D E F G H I J K L M N Ñ O P Q R S T U V W X Y Z"+msgstr "A B C D E F G H I J K L M N Ñ O P Q R S T U V W X Y Z"  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description"-msgstr "Nombre y descripción"+msgstr "Nombre y descripción"  #: libbirdfont/DescriptionDisplay.vala:70 libbirdfont/MenuTab.vala:98 msgid "PostScript Name" msgstr "Nombre de PostScript"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Nombre" @@ -234,11 +235,11 @@ msgstr "Nombre completo (Nombre y Estilo)"  #: libbirdfont/DescriptionDisplay.vala:140 libbirdfont/MenuTab.vala:118 msgid "Unique Identifier"-msgstr "Identificador único"+msgstr "Identificador único" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Versión" @@ -272,20 +273,19 @@ msgstr "Diseñador"  #: libbirdfont/DescriptionDisplay.vala:241 msgid "Vendor URL"-msgstr ""+msgstr "URL del fabricante"  #: libbirdfont/DescriptionDisplay.vala:252 msgid "Designer URL"-msgstr "URL del Diseñador"+msgstr "URL del Diseñador"  #: libbirdfont/DrawingTools.vala:112 msgid "Background Tools" msgstr "Herramientas de fondo"  #: libbirdfont/DrawingTools.vala:113-#, fuzzy msgid "Control Points"-msgstr "Punto de Control"+msgstr "Puntos de Control"  #: libbirdfont/DrawingTools.vala:114 msgid "Object Tools"@@ -309,26 +309,30 @@ msgstr "Trazo"  #: libbirdfont/DrawingTools.vala:128 msgid "Geometrical Shapes"-msgstr "Formas Geométricas"+msgstr "Formas Geométricas" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "Aumentar"  #: libbirdfont/DrawingTools.vala:130 msgid "Guidelines & Grid"-msgstr "Guías y cuadrícula"+msgstr "Guías y cuadrícula"  #: libbirdfont/DrawingTools.vala:135 msgid "Grid Size"-msgstr "Tamaño de Cuadrícula"+msgstr "Tamaño de Cuadrícula" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "Mover lienzo" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -347,201 +351,194 @@ msgstr "Deshacer" msgid "Insert new points on path" msgstr "Insertar puntos nuevos en el trazo" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "Crear curvas cuadráticas de Bézier" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "Crear curvas cúbicas de Bézier" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles"-msgstr "Trazo cuadrático con dos tiradores de línea"+msgstr "Trazo cuadrático con dos tiradores de lí­nea" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Convertir puntos seleccionados" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "Coordenada X" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "Coordenada Y" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "Girar" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "Ancho" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "Alto" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Ligar tiradores de curva al punto de edición seleccionado" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "Tiradores simétricos" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line."-msgstr "Convertir segmento en línea"+msgstr "Convertir el segmento en línea." -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Crear un contador a partir del contorno" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline"-msgstr ""+msgstr "Ajustar el objeto al punto de referencia de la fuente" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path"-msgstr "Cerrar Trazo"+msgstr "Cerrar trazo" -#: libbirdfont/DrawingTools.vala:601-#, fuzzy+#: libbirdfont/DrawingTools.vala:598 msgid "Move to path to the bottom of the layer"-msgstr "Mover trazo a la parte inferior de la capa"+msgstr "Mover al trazo a la parte inferior de la capa" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Voltear el trazo verticalmente" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Voltear el trazo horizontalmente" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "Establecer el tamaño de la imagen de fondo" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "Mostrar/ocultar imagen de fondo" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Insertar una imagen de fondo nueva" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "Alto contraste" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "Fijar nivel de transparencia del fondo" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "Nivel de detalle del trazador automático" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "Simplificación del trazador automático" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "Trazar automáticamente la imagen de fondo" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "Eliminar imagen de fondo" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "Añadir capa" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "Mostrar capas" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "Aplicar trazo" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Ancho del trazo" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke"-msgstr "Crear forma de trazo en contorno "+msgstr "Crear forma de trazo en contorno" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap"-msgstr ""+msgstr "Extremo de línea butt" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap"-msgstr "Línea redondeada"+msgstr "Lí­nea redondeada" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "Linea de borde cuadrado" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines"-msgstr "Mostrar líneas guía"+msgstr "Mostrar guías" -#: libbirdfont/DrawingTools.vala:1020-#, fuzzy+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines"-msgstr "Mostrar líneas guía"+msgstr "Mostrar líneas guía adicionales" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin"-msgstr "Mostrar líneas guía en los márgenes sup. e inf."+msgstr "Mostrar guías en los márgenes superior e inferior" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid"-msgstr ""+msgstr "Bloquear guías y cuadrígula" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "Alejar" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "Mostrar el glifo completo" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "Ajustar a ventana" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "Ampliar la imagen de fondo" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "Vista anterior" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Vista siguiente" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Establecer tamaño de la cuadrícula"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings"-msgstr "Configuraciones de exportación"+msgstr "Configuraciones de exportación"  #: libbirdfont/ExportSettings.vala:45 libbirdfont/ExportSettings.vala:60 msgid "File Name"@@ -549,9 +546,9 @@ msgstr "Nombre del archivo"  #: libbirdfont/ExportSettings.vala:75 msgid "Units Per Em"-msgstr ""+msgstr "Unidades por Em" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "Carpeta" @@ -559,17 +556,17 @@ msgstr "Carpeta" msgid "Formats" msgstr "Formatos" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "Exportar" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Guardar" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "Alfabeto" @@ -583,17 +580,14 @@ msgid "print this message" msgstr "imprimir este mensaje"  #: libbirdfont/ExportUtils.vala:21-#, fuzzy msgid "write files to this directory"-msgstr "Guardar los archivos en este directorio"+msgstr "guardar los archivos en este directorio"  #: libbirdfont/ExportUtils.vala:22-#, fuzzy msgid "write svg file"-msgstr "guardar archivo svg"+msgstr "escribir archivo svg"  #: libbirdfont/ExportUtils.vala:23-#, fuzzy msgid "write ttf and eot file" msgstr "guardar archivos ttf y eot" @@ -621,52 +615,52 @@ msgstr "Fuente libre" msgid "Save font" msgstr "Guardar fuente" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr "Ajustes"  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "Temas" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin"-msgstr ""+msgstr "margen superior" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top"-msgstr ""+msgstr "arriba" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height"-msgstr ""+msgstr "altura de x" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline"-msgstr ""+msgstr "punto de referencia" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom"-msgstr ""+msgstr "inferior" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin"-msgstr ""+msgstr "margen inferior" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left"-msgstr ""+msgstr "izquierda" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right"-msgstr ""+msgstr "derecha" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide"-msgstr "Guía"+msgstr "Guí­a"  #: libbirdfont/GridTool.vala:38 msgid "Show grid"@@ -676,10 +670,6 @@ msgstr "Mostrar cuadrícula" msgid "Guides" msgstr "Guías" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr "Ampliar"@@ -702,56 +692,50 @@ msgstr "Mover punto dentro del eje"  #: libbirdfont/ImportUtils.vala:19 msgid "BF-FILE"-msgstr "ARCHIVOS-BF"+msgstr "ARCHIVOS BF"  #: libbirdfont/ImportUtils.vala:19 msgid "SVG-FILES ..." msgstr "ARCHIVOS-SVG ..." -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "no existe." -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created."-msgstr "Se creará un tipo de letra nuevo."+msgstr "Se creará una fuente nueva." -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import"-msgstr "Falló al importar"+msgstr "Fallo al importar" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "Cancelando" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "no es el nombre de ningún glifo o valor Unicode." -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "Los valores Unicode deben comenzar con U+." -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "Añadiendo" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "a" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "Glifo" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Interletraje" @@ -761,7 +745,7 @@ msgstr "La clase de interletraje actual tiene un formato incorrecto."  #: libbirdfont/KerningDisplay.vala:110 msgid "Add single characters separated by space and ranges on the form A-Z."-msgstr "Se admiten caracteres separados por espacios entre la A y la Z."+msgstr "Agregue caracteres separados por espacios entre la A y la Z."  #: libbirdfont/KerningDisplay.vala:111 msgid "Type “space” to kern the space character and “divis” to kern -."@@ -769,16 +753,16 @@ msgstr "" "Escribe “space” para interletrar el caracter de espacio y “divis” para " "inteletrar -." -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "Unicode" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "Insertar" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Cerrar" @@ -788,18 +772,18 @@ msgstr "Pares de interletraje"  #: libbirdfont/KerningList.vala:57 msgid "No kerning pairs created."-msgstr "No se emparejaron kernings"+msgstr "No se crearon kernings." -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "Clase de interletraje" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Definir" @@ -809,56 +793,58 @@ msgstr "Cargar lineas kerning"  #: libbirdfont/KerningTools.vala:56 msgid "Kerning Tools"-msgstr ""+msgstr "Herramientas de Kerning" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31-#, fuzzy+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size"-msgstr "Tamaño de tipografía"+msgstr "Tamaño de la fuente" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "Crear nueva clase de interletraje." -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "Escribir valores de interletraje de forma manual." -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview"-msgstr ""+msgstr "Inserte glifo desde previsualización" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value"-msgstr "Insertar caracter mediante valor Unicode"+msgstr "Insertar caracter mediante valor unicode" -#: libbirdfont/KerningTools.vala:124-msgid "Open a text file with kerning strings first."+#: libbirdfont/KerningTools.vala:130+msgid "Right to left" msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:139+msgid "Open a text file with kerning strings first."+msgstr "Abrir primero un archivo de texto con cadenas de kerning."++#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string"-msgstr ""+msgstr "Línea de kerning anterior" -#: libbirdfont/KerningTools.vala:136-#, fuzzy+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list."-msgstr "Has llegado al final de la lista."+msgstr "Has llegado al principio de la lista." -#: libbirdfont/KerningTools.vala:145-#, fuzzy+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string"-msgstr "Cargar lineas kerning"+msgstr "Siguiente línea kerning" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "Has llegado al final de la lista." -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions"-msgstr ""+msgstr "Sustituciones" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "Conjunto de caracteres" @@ -866,14 +852,9 @@ msgstr "Conjunto de caracteres" msgid "Character Set" msgstr "Conjunto de caracteres" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166-#, fuzzy+#: libbirdfont/LayerLabel.vala:144 msgid "Layer"-msgstr "Capas"+msgstr "Capa"  #: libbirdfont/LigatureList.vala:53 msgid "character sequence"@@ -885,7 +866,7 @@ msgstr "ligadura"  #: libbirdfont/LigatureList.vala:56 msgid "substitution"-msgstr ""+msgstr "sustitución"  #: libbirdfont/LigatureList.vala:56 msgid "beginning"@@ -905,34 +886,32 @@ msgstr "Nueva ligadura"  #: libbirdfont/LigatureList.vala:109 msgid "New Contextual Substitution"-msgstr "Nueva sustitución contextual"+msgstr "Nueva sustitución contextual"  #: libbirdfont/LigatureList.vala:115-#, fuzzy msgid "Contextual Substitutions"-msgstr "Nueva sustitución contextual"+msgstr "Sustituciones contextuales"  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "Ligaduras" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "Comienzo" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "Medio" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "Fin" -#: libbirdfont/Ligatures.vala:196-#, fuzzy+#: libbirdfont/Ligatures.vala:188 msgid "Ligature"-msgstr "Ligaduras"+msgstr "Ligadura"  #: libbirdfont/Line.vala:157 msgid "Position"@@ -944,21 +923,21 @@ msgstr "Mover"  #: libbirdfont/LoadCallback.vala:29 msgid "This font was made with a newer version of Birdfont."-msgstr ""+msgstr "Esta fuente fue hecha con una versión más actual de Birdfont."  #: libbirdfont/LoadCallback.vala:30 msgid "You need to upgrade your version of Birdfont."-msgstr ""+msgstr "Necesitas actualizar tu versión de Birdfont."  #: libbirdfont/LoadCallback.vala:34 msgid "This font was made with an old version of Birdfont."-msgstr ""+msgstr "Esta fuente fue hecha con una versión anterior de Birdfont."  #: libbirdfont/LoadCallback.vala:35 msgid "You need an older version of Birdfont to open it."-msgstr ""+msgstr "Necesitas una versión anterior de Birdfont para abrirla." -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Secuencia de glifos" @@ -970,7 +949,7 @@ msgstr "Archivo" msgid "New" msgstr "Nuevo" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files" msgstr "Archivos recientes" @@ -988,7 +967,7 @@ msgstr "Salir"  #: libbirdfont/Menu.vala:93 msgid "Edit"-msgstr "Edición"+msgstr "Editar"  #: libbirdfont/Menu.vala:106 msgid "Redo"@@ -1011,16 +990,15 @@ msgid "Select All Paths" msgstr "Seleccionar todos los trazos"  #: libbirdfont/Menu.vala:141-#, fuzzy msgid "Select All Glyphs"-msgstr "Seleccionar todos los trazos"+msgstr "Seleccionar todos los glifos"  #: libbirdfont/Menu.vala:148 msgid "Move To Baseline"-msgstr "Mover a la línea base"+msgstr "Mover a la línea base" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "Buscar" @@ -1030,7 +1008,7 @@ msgstr "Simplificar trazo"  #: libbirdfont/Menu.vala:169 msgid "Merge Paths"-msgstr ""+msgstr "Combinar Trazados"  #: libbirdfont/Menu.vala:176 msgid "Close Path"@@ -1050,11 +1028,11 @@ msgstr "Eliminar glifo de fondo"  #: libbirdfont/Menu.vala:204 msgid "Create Guide"-msgstr "Crear guía"+msgstr "Crear guía"  #: libbirdfont/Menu.vala:211 msgid "List Guides"-msgstr "Mostrar guías"+msgstr "Mostrar guías"  #: libbirdfont/Menu.vala:218 msgid "Select Point Above"@@ -1074,162 +1052,155 @@ msgstr "Seleccionar el punto de abajo"  #: libbirdfont/Menu.vala:253 msgid "Move Layer Up"-msgstr ""+msgstr "Mover Capa hacia Arriba"  #: libbirdfont/Menu.vala:260 msgid "Move Layer Down"-msgstr ""+msgstr "Mover Capa hacia Abajo"  #: libbirdfont/Menu.vala:268 msgid "Import and Export" msgstr "Importar y exportar"  #: libbirdfont/Menu.vala:274-#, fuzzy msgid "Export Fonts"-msgstr "Exportar tipografías"+msgstr "Exportar fuentes"  #: libbirdfont/Menu.vala:281 msgid "Export Glyph as SVG" msgstr "Exportar glifo como SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "Importar archivo SVG" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313-#, fuzzy+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder"-msgstr "Importar archivo SVG"--#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""+msgstr "Importar archivo SVG desde carpeta" -#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "Importar imagen de fondo" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "Previsualizar" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 msgid "Tab" msgstr "Pestaña" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 msgid "Next Tab"-msgstr "Siguiente pestaña"+msgstr "Siguiente pestaña" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 msgid "Previous Tab"-msgstr "Pestaña anterior"+msgstr "Pestaña anterior" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 msgid "Close Tab"-msgstr "Cerrar pestaña"+msgstr "Cerrar pestaña" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs"-msgstr "Cerrar todas las pestañas"+msgstr "Cerrar todas las pestañas" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning"-msgstr ""+msgstr "Espaciado y Kerning" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab"-msgstr "Mostrar pestaña de espaciado"+msgstr "Mostrar pestaña de espaciado" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab"-msgstr "Mostrar pestaña de interletrado"+msgstr "Mostrar pestaña de interletrado" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "Enumerar pares de interletrado" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "Clases de espaciado" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "Seleccionar siguiente par de interletrado" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "Seleccionar par de interletrado anterior" -#: libbirdfont/Menu.vala:431-#, fuzzy+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings"-msgstr "Cargar lineas kerning"+msgstr "Cargar líneas kerning" -#: libbirdfont/Menu.vala:438-#, fuzzy+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings"-msgstr "Cargar lineas kerning"+msgstr "Volver a cargar líneas de kerning" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "Mostrar ligaturas" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature"-msgstr "Añadir ligatura"+msgstr "Añadir ligatura" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "Git" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "Guardar como .bfp" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Vista general" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP"-msgstr ""+msgstr "ARRIBA"  #: libbirdfont/MenuItem.vala:85 msgid "DOWN"-msgstr ""+msgstr "ABAJO"  #: libbirdfont/MenuItem.vala:88 msgid "LEFT"-msgstr ""+msgstr "IZQUIERDA"  #: libbirdfont/MenuItem.vala:91 msgid "RIGHT"-msgstr ""+msgstr "DERECHA"  #: libbirdfont/MenuTab.vala:95 msgid "Missing metadata in font:"-msgstr ""+msgstr "Metadatos faltantes en la fuente:"  #: libbirdfont/MenuTab.vala:128 msgid "" "You need to choose a different name for the TTF file with Mac adjustmets." msgstr ""+"Necesita elegir un nombre diferente para el archivo TTF con ajustes para Mac."  #: libbirdfont/MenuTab.vala:146 msgid "You need to save your font before exporting it."-msgstr ""+msgstr "Necesita guardar su fuente antes de exportarla."  #: libbirdfont/MenuTab.vala:189 msgid "Menu" msgstr "Menú" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+msgid "Can't create TTF font."+msgstr ""++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "Añadir ligadura" @@ -1237,53 +1208,61 @@ msgstr "Añadir ligadura" msgid "Move paths" msgstr "Mover los trazos" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions"-msgstr ""+msgstr "Sustitución de Glifos" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph"-msgstr ""+msgstr "Nuevo glifo" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement"-msgstr ""+msgstr "Reemplazar" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag"+msgstr "Etiqueta"++#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for." msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name"-msgstr ""+msgstr "Nombre del glifo" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names."-msgstr ""+msgstr "Todos los glifos deben tener un nombre."  #: libbirdfont/OtfLabel.vala:47 msgid "Stylistic Alternate"-msgstr ""+msgstr "Estilos alternativos"  #: libbirdfont/OtfLabel.vala:49 msgid "Small Caps"-msgstr ""+msgstr "Versalita"  #: libbirdfont/OtfLabel.vala:51 msgid "Capitals to Small Caps"-msgstr ""+msgstr "Mayúsculas a versalita"  #: libbirdfont/OtfLabel.vala:53 msgid "Swashes"-msgstr ""+msgstr "Caligráfica" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "Filtro" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr "No hay glifos en esta vista."++#: libbirdfont/OverView.vala:1562 msgid "See also:"-msgstr "Ver también:"+msgstr "Vea también:"  #: libbirdfont/OverWriteDialogListener.vala:30 msgid "Overwrite TTF file?"@@ -1300,67 +1279,68 @@ msgstr "Cancelar"  #: libbirdfont/OverWriteDialogListener.vala:33 msgid "Yes, don't ask again."-msgstr "Sí, no preguntar de nuevo."+msgstr "Sí­, no preguntar de nuevo." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform"-msgstr ""+msgstr "Transformar" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master"-msgstr ""+msgstr "Multimaestra" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "Todos los glifos" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "Predeterminado" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "Deformar" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize"-msgstr ""+msgstr "Redimensionar" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate"-msgstr ""+msgstr "Crear alternativa" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation"-msgstr ""+msgstr "Definir la orientación de la curva" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size"-msgstr ""+msgstr "Tamaño principal" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font"-msgstr ""+msgstr "Crear una nueva fuente principal"  #: libbirdfont/OverwriteBfFile.vala:25 msgid "This file already exists. Do you want to replace it?"-msgstr ""+msgstr "Este archivo ya existe. ¿Deseas reemplazarlo?"  #: libbirdfont/OverwriteBfFile.vala:27 msgid "Replace"-msgstr ""+msgstr "Reemplazar"  #: libbirdfont/PenTool.vala:82 msgid "Add new points" msgstr "Añadir nuevos puntos" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "Mover los puntos de control"  #: libbirdfont/PreviewTools.vala:27 msgid "Reload webview"-msgstr "Volver a cargar vista Web"+msgstr "Volver a cargar la vista web"  #: libbirdfont/PreviewTools.vala:33 msgid "Export fonts"@@ -1370,21 +1350,19 @@ msgstr "Exportar tipografías" msgid "Generate html document" msgstr "Generar documento HTML" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet"-msgstr ""+msgstr "No hay fuentes creadas" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "Crear una nueva fuente" -#: libbirdfont/RecentFiles.vala:76-#, fuzzy+#: libbirdfont/RecentFiles.vala:80 msgid "Glyphs"-msgstr "Glifo"+msgstr "Glifos" -#: libbirdfont/RecentFiles.vala:92-#, fuzzy+#: libbirdfont/RecentFiles.vala:96 msgid "Backups" msgstr "Copia de seguridad" @@ -1408,43 +1386,48 @@ msgstr "Descartar" msgid "Save?" msgstr "¿Guardar?" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "Precisión de la herramienta pluma" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "Mostrar u ocultar puntos de control de los tiradores" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "Rellenar trazos abiertos." -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "Usar unidades TTF." -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "Número de puntos añadidos por la herramienta de mano alzada" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "Nivel de simplificación de trazos" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "no traducir"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme"-msgstr ""+msgstr "Paleta de colores" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings"-msgstr "Combinaciones de teclas"+msgstr "Atajos de teclado" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "Caracter" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "Nueva clase de espaciado" @@ -1454,302 +1437,303 @@ msgstr "Espaciado"  #: libbirdfont/SpacingTab.vala:232 msgid "Left"-msgstr ""+msgstr "Izquierda" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right"-msgstr ""+msgstr "Derecha" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "Importar"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background"-msgstr ""+msgstr "Fondo del lienzo" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke"-msgstr ""+msgstr "Trazo relleno" -#: libbirdfont/Theme.vala:423-#, fuzzy+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "Color del trazo" -#: libbirdfont/Theme.vala:424-#, fuzzy+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "Color de los tiradores" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color"-msgstr ""+msgstr "Color de relleno" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects"-msgstr ""+msgstr "Objetos seleccionados" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1"-msgstr ""+msgstr "Fondo 1" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background"-msgstr ""+msgstr "Fondo del cuadro de diálogo" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background"-msgstr ""+msgstr "Fondo del menú" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "Fondo predeterminado" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background"-msgstr ""+msgstr "Fondo de la casilla de verificación" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1"-msgstr ""+msgstr "Primer plano 1" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground"-msgstr ""+msgstr "Primer plano del texto" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "Borde de la tabla" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border"-msgstr ""+msgstr "Borde de la selección" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph"-msgstr ""+msgstr "Previsualizar glifo" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted"-msgstr ""+msgstr "Primer plano invertido" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground"-msgstr ""+msgstr "Primer plano del menú" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground"-msgstr ""+msgstr "Primer plano de la pestaña seleccionada" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator"-msgstr ""+msgstr "Separador de pestañas" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1"-msgstr ""+msgstr "Resaltado 1" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide"-msgstr ""+msgstr "Guía de resaltado" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "Cuadrícula" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1"-msgstr ""+msgstr "Guía 1" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2"-msgstr ""+msgstr "Guía 2" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3"-msgstr ""+msgstr "Guía 3" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1"-msgstr ""+msgstr "Borde del botón 1" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1"-msgstr ""+msgstr "Fondo del botón 1" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2"-msgstr ""+msgstr "Borde del botón 2" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2"-msgstr ""+msgstr "Fondo del botón 2" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3"-msgstr ""+msgstr "Borde de botón 3" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3"-msgstr ""+msgstr "Fondo del botón 3" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4"-msgstr ""+msgstr "Borde del botón 4" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4"-msgstr ""+msgstr "Fondo del botón 4" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground"-msgstr ""+msgstr "Primer plano del botón" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground"-msgstr ""+msgstr "Primer plano del botón seleccionado" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground"-msgstr ""+msgstr "Primer plano de la herramienta" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground"-msgstr ""+msgstr "Primer plano de la herramienta seleccionada" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background"-msgstr ""+msgstr "Fondo del área de texto" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border"-msgstr ""+msgstr "Previsualizar el borde del ítem" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item"-msgstr ""+msgstr "Previsualizar el ítem seleccionado" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1"-msgstr ""+msgstr "Previsualizar ítem 1" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2"-msgstr ""+msgstr "Previsualizar ítem 2" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground"-msgstr ""+msgstr "Previsualizar primer plano seleccionado" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground"-msgstr ""+msgstr "Previsualizar primer plano" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow"-msgstr ""+msgstr "Sombra del cuadro de diálogo" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point"-msgstr ""+msgstr "Punto de control cúbico activo seleccionado" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point"-msgstr ""+msgstr "Punto de control cúbico seleccionado" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point"-msgstr ""+msgstr "Punto de control cúbico activo" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point"-msgstr ""+msgstr "Punto de control cúbico" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point"-msgstr ""+msgstr "Punto de control cuadrático activo seleccionado" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point"-msgstr ""+msgstr "Punto de control cuadrático seleccionado" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point"-msgstr ""+msgstr "Punto de control cuadrático activo" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point"-msgstr ""+msgstr "Punto cuadrático-cúbico" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle"-msgstr ""+msgstr "Herramienta de punto de control seleccionado" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle"-msgstr ""+msgstr "Herramienta activa" -#: libbirdfont/Theme.vala:497-#, fuzzy+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle"-msgstr "Herramientas de punto de control"+msgstr "Herramienta de punto de control" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "Combinar" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button"-msgstr ""+msgstr "Botón de aumento" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button"-msgstr ""+msgstr "Botón de aumento activo" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border"-msgstr ""+msgstr "Borde de la barra de aumento" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name"-msgstr ""+msgstr "Nombre de la fuente" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme"-msgstr ""+msgstr "Nuevo tema" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme"-msgstr ""+msgstr "Añadir un tema nuevo" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors"-msgstr ""+msgstr "Colores" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark"-msgstr ""+msgstr "Oscuro" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright"-msgstr ""+msgstr "Claro" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom"-msgstr ""+msgstr "Personalizado"  #: libbirdfont/ThemeTools.vala:30 msgid "Color"-msgstr ""+msgstr "Color" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift"-msgstr ""+msgstr "Mover"  #: libbirdfont/TrackTool.vala:57 msgid "Freehand drawing"@@ -1757,15 +1741,15 @@ msgstr "Dibujo a mano alzada"  #: libbirdfont/VersionList.vala:51 msgid "New version"-msgstr "Versión nueva"+msgstr "Nueva versión" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "Se han exportado los tipos de letra."  #: birdfont-autotrace/AutoTrace.vala:69 msgid "brighness cutoff, from 0.001 to 2, the default value is 1"-msgstr "el límite de luminosidad, de 0.001 a 2, siendo 1 el valor por defecto"+msgstr "el lí­mite de luminosidad, de 0.001 a 2, siendo 1 el valor por defecto"  #: birdfont-autotrace/AutoTrace.vala:70 msgid "details, from 0.001 to 9.999, the default value is 1"@@ -1792,12 +1776,6 @@ msgstr "Formato de archivo desconocido." msgid "Writing" msgstr "Escribiendo" -#~ msgid "No glyphs in this view."-#~ msgstr "No hay glifos en esta vista."--#~ msgid "Import"-#~ msgstr "Importar"- #~ msgid "Full name (name and style)" #~ msgstr "Nombre completo (nombre y estilo)" diff --git a/po/fi.po b/po/fi.poindex 387a469..48aa0d4 100644--- a/po/fi.po+++ b/po/fi.po@@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-06-27 20:54+0000\n"-"Last-Translator: Jyrki <yardan74@gmail.com>\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2017-03-17 08:48+0000\n"+"Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: fi\n" "MIME-Version: 1.0\n"@@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1435438498.000000\n"+"X-POOTLE-MTIME: 1489740512.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"@@ -42,7 +42,7 @@ msgstr "näytä koordinaatti glyyfinäkymässä"  #: libbirdfont/Argument.vala:283 msgid "exit if a test case fails"-msgstr ""+msgstr "poistu jos testi epäonnistuu"  #: libbirdfont/Argument.vala:284 msgid "treat warnings as fatal"@@ -70,11 +70,11 @@ msgstr "Älä käännä"  #: libbirdfont/Argument.vala:290 msgid "sleep between each command in test suite"-msgstr ""+msgstr "odota testien välillä"  #: libbirdfont/Argument.vala:291 msgid "run test case"-msgstr ""+msgstr "testaa"  #: libbirdfont/BackgroundSelectionTool.vala:23 msgid "Select background"@@ -84,11 +84,16 @@ msgstr "Valitse tausta" msgid "Background Image" msgstr "Taustakuva" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Siirrä tai kierrä taustakuvaa, tai muuta sen kokoa" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr "akselilla"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Valitse taustakuva" @@ -97,7 +102,7 @@ msgid "Images" msgstr "Kuvat"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Tiedostot" @@ -105,16 +110,16 @@ msgstr "Tiedostot" msgid "Parts" msgstr "Osat" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Lisää" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "Valitse Glyyfi" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Avaa"@@ -125,15 +130,11 @@ msgstr "Luo Beziér-käyriä"  #: libbirdfont/BezierTool.vala:95 msgid "line"-msgstr ""+msgstr "rivi"  #: libbirdfont/BezierTool.vala:99 msgid "corner"-msgstr ""--#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr ""+msgstr "kulma"  #: libbirdfont/CircleTool.vala:36 msgid "Circle"@@ -169,37 +170,37 @@ msgstr "japani"  #: libbirdfont/DefaultCharactersSet.vala:32 msgid "Javanese"-msgstr "jaavalainen"+msgstr "Jaavalainen"  #: libbirdfont/DefaultCharactersSet.vala:33 msgid "Latin"-msgstr "Latinalaiset"+msgstr "Latina"  #: libbirdfont/DefaultCharactersSet.vala:34 msgid "Russian"-msgstr "Venäläinen"+msgstr "Venäjä"  #: libbirdfont/DefaultCharactersSet.vala:35 msgid "Swedish"-msgstr "Ruotsalainen"+msgstr "Ruotsi"  #: libbirdfont/DefaultCharactersSet.vala:36 msgid "Thai" msgstr "Thai"  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "a b c d e f g h i j k l m n o p q r s t u v w x y z å ä ö"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö"  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description" msgstr "Nimi ja kuvaus" @@ -208,7 +209,7 @@ msgid "PostScript Name" msgstr "Postscript Nimi"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Nimi" @@ -236,9 +237,9 @@ msgstr "Koko nimi (Nimi ja tyyli)" msgid "Unique Identifier" msgstr "Yksilöllinen tunniste" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Versio" @@ -252,31 +253,31 @@ msgstr "Tekijänoikeus"  #: libbirdfont/DescriptionDisplay.vala:183 msgid "License"-msgstr ""+msgstr "Lisenssi"  #: libbirdfont/DescriptionDisplay.vala:195 msgid "License URL"-msgstr ""+msgstr "Lisenssin URL"  #: libbirdfont/DescriptionDisplay.vala:207 msgid "Trademark"-msgstr ""+msgstr "Tavaramerkki"  #: libbirdfont/DescriptionDisplay.vala:219 msgid "Manufacturer"-msgstr ""+msgstr "Valmistaja"  #: libbirdfont/DescriptionDisplay.vala:230 msgid "Designer"-msgstr ""+msgstr "Suunnittelija"  #: libbirdfont/DescriptionDisplay.vala:241 msgid "Vendor URL"-msgstr ""+msgstr "Valmistajan tunnus"  #: libbirdfont/DescriptionDisplay.vala:252 msgid "Designer URL"-msgstr ""+msgstr "Suunnittelijan URL"  #: libbirdfont/DrawingTools.vala:112 msgid "Background Tools"@@ -310,7 +311,7 @@ msgstr "Viiva" msgid "Geometrical Shapes" msgstr "Geometrinen muoto" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "Zoomaus" @@ -322,12 +323,16 @@ msgstr "Apulinjat & Ruudukko" msgid "Grid Size" msgstr "Ruudukon koko" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "Siirrä piirtoalaa" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -346,197 +351,192 @@ msgstr "Kumoa" msgid "Insert new points on path" msgstr "Lisäää uusia pisteitä tai polkuja" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "Luo toisen asteen Bézier-käyriä" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "Luo kolmannen asteen Bézier-käyriä" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "Toisen asteen polku kahdella kahvalla" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Muunna valitut pisteet" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "X-koordinaatti" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "Y-koordinaatti" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "Kierto" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "Leveys" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "Korkeus" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Sido käyrän valitun muokkauspisteen kahvat " -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "Symmetriset kahvat" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Muuta lohko viivaksi" -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Luo reunaviivasta vastakkainen" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline"-msgstr ""+msgstr "Skaalaa kohde kirjasimen ylä/alareunaan" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path" msgstr "Sulje polku" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 msgid "Move to path to the bottom of the layer" msgstr "Laske tämä taso pinon alimmaksi " -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Peilaa polku pystysuunnassa" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Peilaa polku vaakasuunnassa" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "Aseta koko taustakuvalle" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "Näytä/piilota taustakuva" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Lisää uusi taustakuva" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "Korkea kontrasti" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "Aseta taustan kynnysarvo" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "Automaattijäljityksen yksityiskohtien määrä" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "Automaattijäljityksen yksinkertaistus" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "Automaattijäljitä taustakuva" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "Poista taustakuva" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "Lisää taso" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "Näytä tasot" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "Ota viiva käyttöön" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Viivan leveys" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "Luo viivasta reunaviivat" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "Tasattu viivan pää" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "Pyöristetty viivan pää" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "Neliön muotoinen viivan pää" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Näytä apulinjat" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines" msgstr "näytä lisää apuviivoja" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "Näytä apulinjat ylä- ja alamarginaalissa" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid"-msgstr ""+msgstr "Lukitse opas ja ruudukko" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "Laajenna näkymää lisää" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "Näytä koko glyyfi" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "Sovita näkymään" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "Zoomaa taustakuvaan" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "Edellinen näkymä" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Seuraava näkymä" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Aseta ruudukon koko"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "Vientiasetukset" @@ -546,9 +546,9 @@ msgstr "Tiedostonimi"  #: libbirdfont/ExportSettings.vala:75 msgid "Units Per Em"-msgstr ""+msgstr "Yksiköt" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "Kansio" @@ -556,25 +556,24 @@ msgstr "Kansio" msgid "Formats" msgstr "Muodot" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "Vie" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Tallenna" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "Aakkosto"  #: libbirdfont/ExportUtils.vala:17 libbirdfont/ImportUtils.vala:17 #: birdfont-autotrace/AutoTrace.vala:66-#, fuzzy msgid "Usage:"-msgstr "Käyttö"+msgstr "Käyttöohje:"  #: libbirdfont/ExportUtils.vala:20 birdfont-autotrace/AutoTrace.vala:71 msgid "print this message"@@ -616,52 +615,53 @@ msgstr "Avaa fontti" msgid "Save font" msgstr "Tallenna fontti" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr "Asetukset"  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "Teemat" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin"-msgstr ""+msgstr "yläreunus" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top"-msgstr ""+msgstr "ylhäällä" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height"-msgstr ""+msgstr "x-korkeus" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline"-msgstr ""+msgstr "perusta" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom"-msgstr ""+msgstr "alhaalla" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin"-msgstr ""+msgstr "alamarginaali" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left"-msgstr ""+msgstr "vasen" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569+#, fuzzy msgid "right"-msgstr ""+msgstr "oikea" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide"-msgstr "Apulinja"+msgstr "Opas"  #: libbirdfont/GridTool.vala:38 msgid "Show grid"@@ -669,11 +669,7 @@ msgstr "Näytä ruudukko"  #: libbirdfont/GuideTab.vala:46 libbirdfont/GuideTab.vala:57 msgid "Guides"-msgstr "Apulinjat"--#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""+msgstr "Oppaat"  #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in"@@ -697,56 +693,50 @@ msgstr "Siirrä kahvaa akselin suuntaisesti"  #: libbirdfont/ImportUtils.vala:19 msgid "BF-FILE"-msgstr "BF-Tiedosto"+msgstr "BF-tiedosto"  #: libbirdfont/ImportUtils.vala:19 msgid "SVG-FILES ..." msgstr "SVG-TIEDOSTOT ..." -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "ei ole olemassa" -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "Luodaan uusi kirjasin." -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "Tuominen epäonnistui" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "Keskeytetään" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value."-msgstr "ei ole glyyfin nimi eikä Unicode arvo."+msgstr "ei ole glyyfin nimi eikä Unicode arvoa." -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+."-msgstr "Unicode arvojen pitää alkaa merkeillä \"U+\"."+msgstr "Unicode arvojen pitää alkaa merkeillä U+." -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "Lisätään" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "Glyyfi" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Parivälistys" @@ -761,18 +751,18 @@ msgstr "Lisää yksittäisiä merkkejä A-Z väliltä välilyönnillä erotettun #: libbirdfont/KerningDisplay.vala:111 msgid "Type “space” to kern the space character and “divis” to kern -." msgstr ""-"Kirjoita \"space\" välistääksesi välilyöntiä tai \"divis\" vlälistääksesi -."+"Kirjoita \"space\" välistääksesi välilyöntiä tai \"divis\" välistääksesi -." -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "Unicode" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "Lisää" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Sulje" @@ -784,16 +774,16 @@ msgstr "Välistysparit" msgid "No kerning pairs created." msgstr "Parivälistyspareja ei ole luotu." -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "Parivälistysluokka" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Aseta" @@ -806,51 +796,57 @@ msgstr "Lataa parivälistysketjut" msgid "Kerning Tools" msgstr "Parivälistystyökalut" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "Fonttikoko" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "Luo uusi parivälistysluokka." -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "Käytä tekstikenttää syöttääksesi välistysarvoja." -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "Lisää glyyfi yleisnäkymästä" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "Lisää kirjoitusmerkki unicode arvon mukaan" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "Edellinen parivälistysketju" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "Olet saavuttanut listan alun." -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "Seuraava parivälistysketju" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "Olet saavuttanut listan lopun." -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179+#, fuzzy msgid "Substitutions"-msgstr ""+msgstr "Korvaus" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "Merkistökoodaus" @@ -859,11 +855,7 @@ msgstr "Merkistökoodaus" msgid "Character Set" msgstr "Merkistökoodaus" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer" msgstr "Taso" @@ -878,7 +870,7 @@ msgstr "Ligatuuri"  #: libbirdfont/LigatureList.vala:56 msgid "substitution"-msgstr ""+msgstr "Korvaus"  #: libbirdfont/LigatureList.vala:56 msgid "beginning"@@ -899,31 +891,31 @@ msgstr "Uusi Ligatuuri"  #: libbirdfont/LigatureList.vala:109 msgid "New Contextual Substitution"-msgstr ""+msgstr "Uusi sisällyksen korvaus"  #: libbirdfont/LigatureList.vala:115 msgid "Contextual Substitutions"-msgstr ""+msgstr "Sisällysten korvaukset"  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 #, fuzzy msgid "Ligatures" msgstr "Ligatuuri" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning"-msgstr ""+msgstr "Alku" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "Keskikohta" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End"-msgstr ""+msgstr "Lopeta" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "Ligatuuri" @@ -951,22 +943,21 @@ msgstr "Tämä fontti on tehty Birdfontin vanhemmalla versiolla." msgid "You need an older version of Birdfont to open it." msgstr "Tarvitset vanhemman version Birdfontista avataksesi sen." -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Glyyfijono"  #: libbirdfont/Menu.vala:37-#, fuzzy msgid "File"-msgstr "Tiedostot"+msgstr "Tiedosto"  #: libbirdfont/Menu.vala:43 msgid "New"-msgstr ""+msgstr "Uusi" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files"-msgstr ""+msgstr "Viimeisimmät tiedostot"  #: libbirdfont/Menu.vala:71 msgid "Save As"@@ -1005,15 +996,16 @@ msgid "Select All Paths" msgstr "Valitse kaikki polut"  #: libbirdfont/Menu.vala:141+#, fuzzy msgid "Select All Glyphs"-msgstr ""+msgstr "Valitse kaikki polut"  #: libbirdfont/Menu.vala:148 msgid "Move To Baseline" msgstr "Siirrä peruslinjalle" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "Etsi" @@ -1086,107 +1078,99 @@ msgstr "Vie Fontit" msgid "Export Glyph as SVG" msgstr "Vie glyyfi SVG:nä" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "Tuo SVG-tiedosto" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "Tuo SVG-kansio" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "Tuo Taustakuva" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 msgid "Tab" msgstr "" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 msgid "Next Tab" msgstr "" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 msgid "Previous Tab" msgstr "" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 msgid "Close Tab" msgstr "" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs"-msgstr ""+msgstr "Sulje kaikki välilehdet" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "Välistys ja Parivälistys" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "Näytä Välistys välilehti" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "Näytä parivälistys välilehti" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "Listaa parivälistysparit" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "Välistysluokat" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "Valitse seuraava arivälistyspari" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "Valitse edellinen parivälistyspari" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "Lataa parivälistysketjut" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "Lataa parivälistysketjut uudelleen" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "Näytä ligatuurit" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 #, fuzzy msgid "Add Ligature" msgstr "Lisää ligatuuri" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr "YLÖS"@@ -1220,7 +1204,11 @@ msgstr "" msgid "Menu" msgstr "Valikko" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+msgid "Can't create TTF font."+msgstr ""++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "Lisää ligatuuri" @@ -1228,27 +1216,31 @@ msgstr "Lisää ligatuuri" msgid "Move paths" msgstr "Siirrä polut" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "" @@ -1268,11 +1260,15 @@ msgstr "" msgid "Swashes" msgstr "" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "Suodata" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr "Ei glyyfejä tässä näkymässä."++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "Katso myös:" @@ -1293,43 +1289,44 @@ msgstr "Peru" msgid "Yes, don't ask again." msgstr "Kyllä, älä kysy tätä uudestaa." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "Kaikki Glyyfit" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "Oletus" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "Vinouta" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "" @@ -1345,7 +1342,7 @@ msgstr "" msgid "Add new points" msgstr "Lisää uusia pisteitä" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "Siirrä hallintapisteitä" @@ -1362,20 +1359,20 @@ msgstr "Vie Fontit" msgid "Generate html document" msgstr "Luo html dokumentti" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "Fontteja ei ole vielä luotu" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "Luo Uusi Fontti" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 #, fuzzy msgid "Glyphs" msgstr "Glyyfit" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 msgid "Backups" msgstr "Varmuuskopiot" @@ -1399,43 +1396,48 @@ msgstr "Hylkää" msgid "Save?" msgstr "Tallenna?" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool"-msgstr ""+msgstr "Kynätyökalun tarkkuus" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles"-msgstr ""+msgstr "Näytä tai piilota kontrollien tarkistuspisteet" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "Täytä avoimet polut." -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "Käytä TTF yksikköjä." -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "Älä käännä"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "" @@ -1447,289 +1449,294 @@ msgstr "" msgid "Left" msgstr "Vasen" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "Oikea" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "Tuo"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "Piirtoalan tausta" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke"-msgstr "Täytetty reunaviiva"+msgstr "Täytetty reuna" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "Viivan väri" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "Kahvan väri" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "Täyttöväri" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "Valitut kohteet" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "Tausta 1" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "Valintaikkunan tausta" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "Valikon tausta" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "Oletustausta" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "Valitun välilehden etuala" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "Välilehtien erotin" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "Korostettu 1" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "Korostettu apulinja" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "Ruudukko" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "Apulinja 1" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "Apulinja 2" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "Apulinja 3" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "Painikkeen Reuna 1" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "Painikkeen Tausta 1" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "Painikkeen Reuna 2" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "Painikkeen Tausta 2" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "Painikkeen Reuna 3" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "Painikkeen tausta 3" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "Painikkeen Reuna 4" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "Painikkeen tausta 4" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "Painkkeen Edusta" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 #, fuzzy msgid "Selected Button Foreground" msgstr "Valitun painikkeen etuala" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 #, fuzzy msgid "Selected Tool Foreground" msgstr "Valitun välilehden etuala" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478+#, fuzzy msgid "Glyph Count Background 1"-msgstr ""+msgstr "Glyyfi laskurin tausta 2" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "Glyyfi laskurin tausta 2" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "Valintaikkunan Varjo" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "Lisää uusi teema" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "Värit" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "Tumma" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "Kirkas" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "Mukautettu" @@ -1737,7 +1744,7 @@ msgstr "Mukautettu" msgid "Color" msgstr "Väri" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "" @@ -1749,7 +1756,7 @@ msgstr "" msgid "New version" msgstr "" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "" @@ -1782,11 +1789,9 @@ msgstr "" msgid "Writing" msgstr "" -#~ msgid "No glyphs in this view."-#~ msgstr "Ei glyyfejä tässä näkymässä."--#~ msgid "Import"-#~ msgstr "Tuo"+#, fuzzy+#~ msgid "color"+#~ msgstr "Väri"  #, fuzzy #~ msgid "Full name (name and style)"diff --git a/po/fr.po b/po/fr.poindex a932fb0..bd5c2d2 100644--- a/po/fr.po+++ b/po/fr.po@@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-12-19 13:31+0000\n"-"Last-Translator: fasterthanlime <amos@itch.io>\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2017-06-07 04:34+0000\n"+"Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: fr\n" "MIME-Version: 1.0\n"@@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1450531910.000000\n"+"X-POOTLE-MTIME: 1496810077.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"@@ -58,7 +58,7 @@ msgstr "écrire un fichier de journalisation"  #: libbirdfont/Argument.vala:287 msgid "enable Machintosh customizations"-msgstr "activer les personalisations Mac"+msgstr "Activer les personnalisations pour Macintosh"  #: libbirdfont/Argument.vala:288 msgid "enable Windows customizations"@@ -84,20 +84,25 @@ msgstr "Sélectionner un arrière-plan" msgid "Background Image" msgstr "Image d'arrière-plan" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Déplacer, redimensionner et pivoter l'image d’arrière-plan" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr "sur l’axe"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image"-msgstr "Sélectionner une image d'arrière-plan"+msgstr "Sélectionner l’image d'arrière-plan"  #: libbirdfont/BackgroundTools.vala:27 msgid "Images" msgstr "Images"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Fichiers" @@ -105,23 +110,23 @@ msgstr "Fichiers" msgid "Parts" msgstr "Parties" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Ajouter" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "Sélectionner un glyphe" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Ouvrir"  #: libbirdfont/BezierTool.vala:91 msgid "Create Beziér curves"-msgstr "Créer une courbe de Bézier"+msgstr "Créer des courbes de Bézier"  #: libbirdfont/BezierTool.vala:95 msgid "line"@@ -131,17 +136,13 @@ msgstr "ligne" msgid "corner" msgstr "coin" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr "sur l’axe"- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "Cercle"  #: libbirdfont/CutBackgroundTool.vala:38 msgid "Crop background image"-msgstr "Rogner l'image de fond"+msgstr "Rogner l'image d’arrière-plan"  #: libbirdfont/DefaultCharactersSet.vala:25 msgid "Default Language"@@ -188,18 +189,18 @@ msgid "Thai" msgstr "Thaï"  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "a b c d e f g h i j k l m n o p q r s t u v w x y z"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description" msgstr "Nom et description" @@ -208,7 +209,7 @@ msgid "PostScript Name" msgstr "Nom PostScript"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Nom" @@ -221,13 +222,12 @@ msgid "Bold" msgstr "Gras"  #: libbirdfont/DescriptionDisplay.vala:109-#, fuzzy msgid "Italic" msgstr "Italique"  #: libbirdfont/DescriptionDisplay.vala:119 msgid "Weight"-msgstr "Graisse"+msgstr "Poids"  #: libbirdfont/DescriptionDisplay.vala:129 libbirdfont/MenuTab.vala:113 msgid "Full Name (Name and Style)"@@ -237,9 +237,9 @@ msgstr "Nom complet (nom et style)" msgid "Unique Identifier" msgstr "Identifiant unique" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Version" @@ -261,7 +261,7 @@ msgstr "Adresse de la licence"  #: libbirdfont/DescriptionDisplay.vala:207 msgid "Trademark"-msgstr ""+msgstr "Marque déposée"  #: libbirdfont/DescriptionDisplay.vala:219 msgid "Manufacturer"@@ -269,28 +269,27 @@ msgstr "Constructeur"  #: libbirdfont/DescriptionDisplay.vala:230 msgid "Designer"-msgstr ""+msgstr "Graphiste"  #: libbirdfont/DescriptionDisplay.vala:241 msgid "Vendor URL"-msgstr ""+msgstr "Site vendeur"  #: libbirdfont/DescriptionDisplay.vala:252 msgid "Designer URL"-msgstr ""+msgstr "Site graphiste "  #: libbirdfont/DrawingTools.vala:112 msgid "Background Tools"-msgstr ""+msgstr "Outils d’arrière-plan"  #: libbirdfont/DrawingTools.vala:113-#, fuzzy msgid "Control Points"-msgstr "Point de contrôle"+msgstr "Points de contrôle"  #: libbirdfont/DrawingTools.vala:114 msgid "Object Tools"-msgstr ""+msgstr "Outils de l’objet"  #: libbirdfont/DrawingTools.vala:123 msgid "Drawing Tools"@@ -302,7 +301,7 @@ msgstr "Point de contrôle"  #: libbirdfont/DrawingTools.vala:126 libbirdfont/Menu.vala:247 msgid "Layers"-msgstr "Couches"+msgstr "Calques"  #: libbirdfont/DrawingTools.vala:127 msgid "Stroke"@@ -312,7 +311,7 @@ msgstr "Tracé" msgid "Geometrical Shapes" msgstr "Formes géométrique" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "Zoom" @@ -324,12 +323,16 @@ msgstr "Lignes guide et grille" msgid "Grid Size" msgstr "Taille de la grille" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "Déplacer le canevas" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -338,7 +341,7 @@ msgstr "Supprimer"  #: libbirdfont/DrawingTools.vala:211 msgid "Select all points or paths"-msgstr "Sélectionnez tous les points de la ligne"+msgstr "Sélectionner tous les points ou tracés"  #: libbirdfont/DrawingTools.vala:227 libbirdfont/Menu.vala:99 msgid "Undo"@@ -346,234 +349,227 @@ msgstr "Retour"  #: libbirdfont/DrawingTools.vala:234 msgid "Insert new points on path"-msgstr "Insérer de nouveaux points sur le chemin"+msgstr "Insérer de nouveaux points sur le tracé" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "Créer des courbes de Bézier quadratiques" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "Créer des courbes de Bézier cubiques" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "Chemin quadratique avec deux poignées de contrôle" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Convertir les points sélectionnés" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "Coordonnée X" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "Coordonnée Y" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "Rotation" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "Largeur" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "Hauteur" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Lier les points de la courbe pour le point sélectionné" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "Poignées symétriques" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Convertir le segment en ligne." -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Créer un compteur depuis la ligne extérieure" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path" msgstr "Fermer le tracé" -#: libbirdfont/DrawingTools.vala:601-#, fuzzy+#: libbirdfont/DrawingTools.vala:598 msgid "Move to path to the bottom of the layer"-msgstr "Déplacer la feuille vers le calque bas"+msgstr "Déplacer le tracé vers le bas du calque" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Retourner verticalement le tracé" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Retourner horizontalement le tracé" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "Définir la taille de l'image de fond" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "Afficher/cacher l'image de fond" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Insérer une nouvelle image de fond" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "Contraste élevé" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "Définir le seuil d'arrière plan" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "Importance des détails d'autotrace" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "Simplification du tracé automatique" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "Tracé automatique de l'image d'arrière-plan" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "Effacer l'image de fond ?" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "ajouter un calque" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers"-msgstr ""+msgstr "Afficher les calques" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 #, fuzzy msgid "Apply stroke" msgstr "Appliquer le tracé" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Épaisseur de trait" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "Créer un contour depuis le tracé" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap"-msgstr ""+msgstr "fin de trace ronde" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap"-msgstr ""+msgstr "Fin de tracé carré" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Afficher les recommandations" -#: libbirdfont/DrawingTools.vala:1020-#, fuzzy+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines"-msgstr "Afficher les recommandations"+msgstr "Afficher plus de lignes directrices" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "Afficher le guide aux marges du haut et du bas" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid"-msgstr ""+msgstr "Verrouiller les repères et la grille" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "Dézoomer encore" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "Afficher le glyphe complet" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view"-msgstr ""+msgstr "Ajuster à la taille de la fenêtre" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "Zoom sur l'image de fond" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "Vue précédente" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Vue suivante" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Définir les dimensions de la grille"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings"-msgstr ""+msgstr "Exporter les paramètres"  #: libbirdfont/ExportSettings.vala:45 libbirdfont/ExportSettings.vala:60 msgid "File Name"-msgstr ""+msgstr "Nom du fichier"  #: libbirdfont/ExportSettings.vala:75 msgid "Units Per Em"-msgstr ""+msgstr "Unités par Em" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder"-msgstr ""+msgstr "Dossier"  #: libbirdfont/ExportSettings.vala:98 msgid "Formats"-msgstr ""+msgstr "Formats" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "Exporter" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Enregistrer" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet"-msgstr ""+msgstr "Alphabet"  #: libbirdfont/ExportUtils.vala:17 libbirdfont/ImportUtils.vala:17 #: birdfont-autotrace/AutoTrace.vala:66@@ -604,70 +600,70 @@ msgstr "Impossible de trouver le répertoire cible"  #: libbirdfont/FileDialogTab.vala:79 msgid "Select a Folder"-msgstr ""+msgstr "Choisir un dossier"  #: libbirdfont/FileDialogTab.vala:83 msgid "Folders"-msgstr ""+msgstr "Dossiers"  #: libbirdfont/FileTools.vala:31 msgid "New font"-msgstr ""+msgstr "Nouvelle police"  #: libbirdfont/FileTools.vala:37 msgid "Open font"-msgstr ""+msgstr "Ouvrir une police"  #: libbirdfont/FileTools.vala:43 msgid "Save font"-msgstr ""+msgstr "Enregistrer la police" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings"-msgstr ""+msgstr "Paramètres"  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes"-msgstr ""+msgstr "Thèmes" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin"-msgstr ""+msgstr "Marge supérieure" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top"-msgstr ""+msgstr "haut" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height"-msgstr ""+msgstr "Hauteur d'x" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline"-msgstr ""+msgstr "Ligne de base" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom"-msgstr ""+msgstr "Bas" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin"-msgstr ""+msgstr "marge du bas" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left"-msgstr ""+msgstr "gauche" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right"-msgstr ""+msgstr "droite" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide"-msgstr ""+msgstr "Repère"  #: libbirdfont/GridTool.vala:38 msgid "Show grid"@@ -675,15 +671,11 @@ msgstr "Afficher la grille"  #: libbirdfont/GuideTab.vala:46 libbirdfont/GuideTab.vala:57 msgid "Guides"-msgstr ""--#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""+msgstr "Repères"  #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in"-msgstr "Zoom avant"+msgstr "Zoomer"  #: libbirdfont/HiddenTools.vala:40 msgid "Zoom out"@@ -691,15 +683,15 @@ msgstr "Zoom arrière"  #: libbirdfont/HiddenTools.vala:47 msgid "Convert the last segment to a straight line"-msgstr ""+msgstr "Convertir le dernier segment en ligne droite"  #: libbirdfont/HiddenTools.vala:55 msgid "Convert the last control point to a corner node"-msgstr ""+msgstr "Convertir le dernier point de contrôle en nœud de coin"  #: libbirdfont/HiddenTools.vala:63 msgid "Move handle along axis"-msgstr ""+msgstr "Déplacer les poignées le long de l’axe"  #: libbirdfont/ImportUtils.vala:19 msgid "BF-FILE"@@ -709,50 +701,44 @@ msgstr "FICHIER-BF" msgid "SVG-FILES ..." msgstr "FICHIERS SVG ..." -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "n'existe pas." -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "Une nouvelle police sera créé." -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "Échec de l'importation" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "Annulation en cours" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "n'est pas un nom de glyphe ou une valeur Unicode" -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "Les valeurs Unicode doivent commencer par U+." -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "Ajout" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "vers" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "Glyphe" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Crénage" @@ -771,16 +757,16 @@ msgid "Type “space” to kern the space character and “divis” to kern -." msgstr "" "Tapez [Espace] pour créner l'espace entre les caractères et [/] pour créner" -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode"-msgstr ""+msgstr "Unicode" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert"-msgstr ""+msgstr "Insérer" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Fermer" @@ -790,75 +776,79 @@ msgstr "Approche de paires"  #: libbirdfont/KerningList.vala:57 msgid "No kerning pairs created."-msgstr ""+msgstr "Aucune paire de crénage créée." -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "type d'approche" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Définir"  #: libbirdfont/KerningStrings.vala:65 msgid "Load kerning strings"-msgstr ""+msgstr "Charger des chaînes de crénage"  #: libbirdfont/KerningTools.vala:56 msgid "Kerning Tools"-msgstr ""+msgstr "Outils de crénage" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31-#, fuzzy+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "Taille de la police" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "Créer une nouvelle catégorie de crénage." -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "Utilisez la saisie de texte pour saisir des valeurs de crénage." -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview"-msgstr ""+msgstr "Insérer un glyphe depuis la vue d’ensemble" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value"+msgstr "Insérer un caractère par sa valeur unicode"++#: libbirdfont/KerningTools.vala:130+msgid "Right to left" msgstr "" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "" -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "" -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions"-msgstr ""+msgstr "Substitution" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 #, fuzzy msgid "Character Sets" msgstr "Jeu de caractères"@@ -867,43 +857,38 @@ msgstr "Jeu de caractères" msgid "Character Set" msgstr "Jeu de caractères" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166-#, fuzzy+#: libbirdfont/LayerLabel.vala:144 msgid "Layer"-msgstr "Couches"+msgstr "Calque"  #: libbirdfont/LigatureList.vala:53 msgid "character sequence"-msgstr ""+msgstr "séquence de caractères"  #: libbirdfont/LigatureList.vala:53-#, fuzzy msgid "ligature"-msgstr "Ligatures"+msgstr "ligature"  #: libbirdfont/LigatureList.vala:56+#, fuzzy msgid "substitution"-msgstr ""+msgstr "Substitution"  #: libbirdfont/LigatureList.vala:56 msgid "beginning"-msgstr ""+msgstr "début"  #: libbirdfont/LigatureList.vala:56 msgid "middle"-msgstr ""+msgstr "milieu"  #: libbirdfont/LigatureList.vala:56 msgid "end"-msgstr ""+msgstr "fin"  #: libbirdfont/LigatureList.vala:109 msgid "New Ligature"-msgstr ""+msgstr "Nouvelle ligature"  #: libbirdfont/LigatureList.vala:109 msgid "New Contextual Substitution"@@ -914,23 +899,23 @@ msgid "Contextual Substitutions" msgstr ""  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "Ligatures" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning"-msgstr ""+msgstr "Début" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle"-msgstr ""+msgstr "Milieu" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End"-msgstr ""+msgstr "Fin" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 #, fuzzy msgid "Ligature" msgstr "Ligatures"@@ -941,101 +926,88 @@ msgid "Position" msgstr "Positionner"  #: libbirdfont/Line.vala:157-#, fuzzy msgid "Move"-msgstr "_Déplacer"+msgstr "Déplacer"  #: libbirdfont/LoadCallback.vala:29 msgid "This font was made with a newer version of Birdfont."-msgstr ""+msgstr "Cette police a été créée avec une version plus récente de Birdfont."  #: libbirdfont/LoadCallback.vala:30 msgid "You need to upgrade your version of Birdfont."-msgstr ""+msgstr "Vous devez mettre à niveau votre version de Birdfont."  #: libbirdfont/LoadCallback.vala:34 msgid "This font was made with an old version of Birdfont."-msgstr ""+msgstr "Cette police a été créée avec une ancienne version de Birdfont."  #: libbirdfont/LoadCallback.vala:35 msgid "You need an older version of Birdfont to open it."-msgstr ""+msgstr "Vous avez besoin d’une ancienne version de Birdfont pour l’ouvrir." -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Enchainement du glyphe"  #: libbirdfont/Menu.vala:37-#, fuzzy msgid "File"-msgstr "Fichiers"+msgstr "Fichier"  #: libbirdfont/Menu.vala:43-#, fuzzy msgid "New"-msgstr "_Nouveau"+msgstr "Nouveau" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81-#, fuzzy+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files"-msgstr "Fichiers _récents"+msgstr "Fichiers récents"  #: libbirdfont/Menu.vala:71-#, fuzzy msgid "Save As"-msgstr "Enregistrer _sous"+msgstr "Enregistrer sous"  #: libbirdfont/Menu.vala:78-#, fuzzy msgid "Select Character Set"-msgstr "Choisir un jeu de -Caractères"+msgstr "Choisir un jeu de caractères"  #: libbirdfont/Menu.vala:85-#, fuzzy msgid "Quit"-msgstr "_Quitter"+msgstr "Quitter"  #: libbirdfont/Menu.vala:93-#, fuzzy msgid "Edit" msgstr "Éditer"  #: libbirdfont/Menu.vala:106 msgid "Redo"-msgstr ""+msgstr "Rétablir"  #: libbirdfont/Menu.vala:113-#, fuzzy msgid "Copy"-msgstr "_Copier"+msgstr "Copier"  #: libbirdfont/Menu.vala:120-#, fuzzy msgid "Paste"-msgstr "_Coller"+msgstr "Coller"  #: libbirdfont/Menu.vala:127-#, fuzzy msgid "Paste In Place"-msgstr "Coller en place"+msgstr "Coller sur place"  #: libbirdfont/Menu.vala:134-#, fuzzy msgid "Select All Paths"-msgstr "Sélectionner _Tous les Chemins"+msgstr "Sélectionner tous les tracés"  #: libbirdfont/Menu.vala:141 #, fuzzy msgid "Select All Glyphs"-msgstr "Sélectionner _Tous les Chemins"+msgstr "Sélectionner tous les glyphes"  #: libbirdfont/Menu.vala:148-#, fuzzy msgid "Move To Baseline"-msgstr "Déplacer vers Baseline"+msgstr "Déplacer vers la ligne de base" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "Rechercher" @@ -1046,12 +1018,11 @@ msgstr "Simpl-ifiez le tracé"  #: libbirdfont/Menu.vala:169 msgid "Merge Paths"-msgstr ""+msgstr "Fusionner les tracés"  #: libbirdfont/Menu.vala:176-#, fuzzy msgid "Close Path"-msgstr "_Fermer le chemin"+msgstr "Fermer le tracé"  #: libbirdfont/Menu.vala:183 #, fuzzy@@ -1068,11 +1039,11 @@ msgstr ""  #: libbirdfont/Menu.vala:204 msgid "Create Guide"-msgstr ""+msgstr "Créer un repère"  #: libbirdfont/Menu.vala:211 msgid "List Guides"-msgstr ""+msgstr "Lister les repères"  #: libbirdfont/Menu.vala:218 #, fuzzy@@ -1080,9 +1051,8 @@ msgid "Select Point Above" msgstr "_Sélectionner le point au dessus"  #: libbirdfont/Menu.vala:225-#, fuzzy msgid "Select Next Point"-msgstr "Sélectionner _le point suivant"+msgstr "Sélectionner le point suivant"  #: libbirdfont/Menu.vala:232 #, fuzzy@@ -1096,147 +1066,132 @@ msgstr "Sélectionner un point_dessous"  #: libbirdfont/Menu.vala:253 msgid "Move Layer Up"-msgstr ""+msgstr "Déplacer le calque vers le haut"  #: libbirdfont/Menu.vala:260 msgid "Move Layer Down"-msgstr ""+msgstr "Déplacer le calque vers le bas"  #: libbirdfont/Menu.vala:268 msgid "Import and Export"-msgstr ""+msgstr "Importer et exporter"  #: libbirdfont/Menu.vala:274-#, fuzzy msgid "Export Fonts" msgstr "Exporter les polices"  #: libbirdfont/Menu.vala:281-#, fuzzy msgid "Export Glyph as SVG"-msgstr "_Exporter le glyphe au format SVG"+msgstr "Exporter le glyphe au format SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file"-msgstr ""+msgstr "Importer un fichier SVG" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder"-msgstr ""--#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""+msgstr "Importer un dossier SVG" -#: libbirdfont/Menu.vala:322-#, fuzzy+#: libbirdfont/Menu.vala:302 msgid "Import Background Image"-msgstr "Choix d'une image d'arrière-plan"+msgstr "Importer une image d'arrière-plan" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "Aperçu" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 #, fuzzy msgid "Tab" msgstr "Onglet" -#: libbirdfont/Menu.vala:350-#, fuzzy+#: libbirdfont/Menu.vala:330 msgid "Next Tab"-msgstr "Onglet _Suivant"+msgstr "Onglet  Suivant" -#: libbirdfont/Menu.vala:357-#, fuzzy+#: libbirdfont/Menu.vala:337 msgid "Previous Tab" msgstr "Onglet précédent" -#: libbirdfont/Menu.vala:364-#, fuzzy+#: libbirdfont/Menu.vala:344 msgid "Close Tab"-msgstr "_Fermer l'onglet"+msgstr "Fermer l'onglet" -#: libbirdfont/Menu.vala:371-#, fuzzy+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs"-msgstr "_Fermer _tous les onglets"+msgstr "Fermer tous les onglets" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning"-msgstr ""+msgstr "Espacement et crénage" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 #, fuzzy msgid "Show Spacing Tab" msgstr "Montrer -l'Espacement de Tabulation" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 #, fuzzy msgid "Show Kerning Tab" msgstr "Montrer l'onglet de crénage" -#: libbirdfont/Menu.vala:399-#, fuzzy+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs"-msgstr "_Lister les paires de crénage"+msgstr "Lister les paires de crénage" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 #, fuzzy msgid "Spacing Classes" msgstr "classe espacement" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 #, fuzzy msgid "Select Next Kerning Pair" msgstr "Sélectionner la Paire de Crénage _Suivante" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 #, fuzzy msgid "Select Previous Kerning Pair" msgstr "Sélectionner la _Précédente Paire de Crénage" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 #, fuzzy msgid "Show Ligatures" msgstr "Montrer les Ligatures" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450+#, fuzzy msgid "Add Ligature"-msgstr ""+msgstr "Nouvelle ligature" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 #, fuzzy msgid "Save As .bfp" msgstr "Enregistrer en .bfp" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Vue d'ensemble" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP"-msgstr ""+msgstr "HAUT"  #: libbirdfont/MenuItem.vala:85 msgid "DOWN"-msgstr ""+msgstr "BAS"  #: libbirdfont/MenuItem.vala:88 msgid "LEFT"@@ -1263,35 +1218,44 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: libbirdfont/MenuTab.vala:696-msgid "Add ligature"+#: libbirdfont/MenuTab.vala:216+msgid "Can't create TTF font." msgstr "" +#: libbirdfont/MenuTab.vala:702+#, fuzzy+msgid "Add ligature"+msgstr "Nouvelle ligature"+ #: libbirdfont/MoveTool.vala:41 msgid "Move paths" msgstr "Changer les chemins" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph"-msgstr ""+msgstr "Nouvelle glyphe" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "" @@ -1311,11 +1275,15 @@ msgstr "" msgid "Swashes" msgstr "" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "Filtrer" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr "Pas de glyphe dans cet aperçu."++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "Voir également :" @@ -1336,43 +1304,44 @@ msgstr "Annuler" msgid "Yes, don't ask again." msgstr "Oui, ne plus poser la question." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "Penché" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "" @@ -1388,7 +1357,7 @@ msgstr "" msgid "Add new points" msgstr "Ajouter de nouveaux points" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "Déplacer les points de contrôle" @@ -1404,20 +1373,20 @@ msgstr "Exporter les polices" msgid "Generate html document" msgstr "Générer un document HTML" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 #, fuzzy msgid "Glyphs" msgstr "Glyphe" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 #, fuzzy msgid "Backups" msgstr "Sauvegarde"@@ -1442,43 +1411,48 @@ msgstr "Abandonner" msgid "Save?" msgstr "Enregistrer ?" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "" -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "Utiliser les unités TTF" -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "ne pas traduire"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "Caractère" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 #, fuzzy msgid "New spacing class" msgstr "Nouvelle classe d'espacement"@@ -1488,300 +1462,309 @@ msgid "Spacing" msgstr ""  #: libbirdfont/SpacingTab.vala:232+#, fuzzy msgid "Left"-msgstr ""+msgstr "gauche" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277+#, fuzzy msgid "Right"-msgstr ""+msgstr "droite" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "Importer"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 #, fuzzy msgid "Stroke Color" msgstr "Couleur du contour" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 #, fuzzy msgid "Handle Color" msgstr "Couleur de l'identificateur" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109+#, fuzzy msgid "Colors"-msgstr ""+msgstr "couleur" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154+#, fuzzy msgid "Bright"-msgstr ""+msgstr "droite" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr ""  #: libbirdfont/ThemeTools.vala:30+#, fuzzy msgid "Color"-msgstr ""+msgstr "couleur" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "" @@ -1793,7 +1776,7 @@ msgstr "Dessin à main levée" msgid "New version" msgstr "Nouvelle version" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "Vos Fontes ont été exportées." @@ -1826,11 +1809,8 @@ msgstr "Format de fichier inconnu" msgid "Writing" msgstr "Écriture" -#~ msgid "No glyphs in this view."-#~ msgstr "Pas de glyphe dans cet aperçu."--#~ msgid "Import"-#~ msgstr "Importer"+#~ msgid "color"+#~ msgstr "couleur"  #~ msgid "Full name (name and style)" #~ msgstr "Nom complet (nom et style)"diff --git a/po/he.po b/po/he.poindex 6585d77..042f0ee 100644--- a/po/he.po+++ b/po/he.po@@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-09-01 15:09+0000\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2017-03-25 18:02+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: he\n"@@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1441120190.000000\n"+"X-POOTLE-MTIME: 1490464924.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"@@ -33,64 +33,68 @@ msgid "OPTION" msgstr "אפשרות"  #: libbirdfont/Argument.vala:281-#, fuzzy msgid "enable Android customizations"-msgstr "להפעיל התאמות למקינטוש"+msgstr "הפעל התאמות לאנדרויד"  #: libbirdfont/Argument.vala:282 msgid "show coordinate in glyph view"-msgstr "להציג נקודות ציון בתצוגת גליף"+msgstr "הצג נקודת ציון בתצוגת גילוף"  #: libbirdfont/Argument.vala:283 msgid "exit if a test case fails"-msgstr "לצאת אם בדיקה נכשלה"+msgstr "צא אם הבדיקה נכשלת"  #: libbirdfont/Argument.vala:284+#, fuzzy msgid "treat warnings as fatal"-msgstr "להתייחס אל אזהרות כאל שגיאות סופניות"+msgstr "התייחס אל אזהרות כאל שגיאות סופניות"  #: libbirdfont/Argument.vala:285 msgid "show this message"-msgstr "להציג את ההודעה הזאת"+msgstr "הצג הודעה זו"  #: libbirdfont/Argument.vala:286 msgid "write a log file"-msgstr ""+msgstr "כתוב קובץ log"  #: libbirdfont/Argument.vala:287 msgid "enable Machintosh customizations"-msgstr "להפעיל התאמות למקינטוש"+msgstr "הפעל התאמות למקינטוש"  #: libbirdfont/Argument.vala:288-#, fuzzy msgid "enable Windows customizations"-msgstr "להפעיל התאמות למקינטוש"+msgstr "הפעל התאמות לווינדוס"  #: libbirdfont/Argument.vala:289 msgid "don't translate"-msgstr "לא לתרגם"+msgstr "אל תתרגם"  #: libbirdfont/Argument.vala:290 msgid "sleep between each command in test suite"-msgstr ""+msgstr "שינה בפמי כל פקודה במצב טסטס"  #: libbirdfont/Argument.vala:291 msgid "run test case"-msgstr ""+msgstr "הפעיל מצב טסט"  #: libbirdfont/BackgroundSelectionTool.vala:23 msgid "Select background"-msgstr ""+msgstr "בחירת צבע רקע"  #: libbirdfont/BackgroundTab.vala:47 libbirdfont/BackgroundTools.vala:26 msgid "Background Image"-msgstr ""+msgstr "תמונת קרע" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr ""++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "" @@ -99,7 +103,7 @@ msgid "Images" msgstr "תמונות"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "קבצים" @@ -107,16 +111,16 @@ msgstr "קבצים" msgid "Parts" msgstr "חלקים" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr ""@@ -133,10 +137,6 @@ msgstr "" msgid "corner" msgstr "" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr ""- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "עיגול"@@ -190,34 +190,35 @@ msgstr "" msgid "Thai" msgstr "" +# לא לתרגם #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr ""  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr ""  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description" msgstr ""  #: libbirdfont/DescriptionDisplay.vala:70 libbirdfont/MenuTab.vala:98 msgid "PostScript Name"-msgstr ""+msgstr "שם PostScript"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name"-msgstr ""+msgstr "שם"  #: libbirdfont/DescriptionDisplay.vala:90 libbirdfont/MenuTab.vala:108 msgid "Style"-msgstr ""+msgstr "סגנון"  #: libbirdfont/DescriptionDisplay.vala:100 msgid "Bold"@@ -229,7 +230,7 @@ msgstr ""  #: libbirdfont/DescriptionDisplay.vala:119 msgid "Weight"-msgstr ""+msgstr "משקל"  #: libbirdfont/DescriptionDisplay.vala:129 libbirdfont/MenuTab.vala:113 msgid "Full Name (Name and Style)"@@ -239,11 +240,11 @@ msgstr "" msgid "Unique Identifier" msgstr "" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version"-msgstr ""+msgstr "גרסה"  #: libbirdfont/DescriptionDisplay.vala:160 msgid "Description"@@ -267,7 +268,7 @@ msgstr ""  #: libbirdfont/DescriptionDisplay.vala:219 msgid "Manufacturer"-msgstr ""+msgstr "יצרן"  #: libbirdfont/DescriptionDisplay.vala:230 msgid "Designer"@@ -303,7 +304,7 @@ msgstr ""  #: libbirdfont/DrawingTools.vala:126 libbirdfont/Menu.vala:247 msgid "Layers"-msgstr ""+msgstr "שכבות"  #: libbirdfont/DrawingTools.vala:127 msgid "Stroke"@@ -313,7 +314,7 @@ msgstr "" msgid "Geometrical Shapes" msgstr "" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "" @@ -325,12 +326,16 @@ msgstr "" msgid "Grid Size" msgstr "" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -349,197 +354,192 @@ msgstr "" msgid "Insert new points on path" msgstr "" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation"-msgstr ""+msgstr "סיבוב" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width"-msgstr ""+msgstr "רוחב" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height"-msgstr ""+msgstr "גובה" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "" -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path" msgstr "" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 msgid "Move to path to the bottom of the layer" msgstr "" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines" msgstr "" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr ""  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "" @@ -551,7 +551,7 @@ msgstr "" msgid "Units Per Em" msgstr "" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "" @@ -559,17 +559,17 @@ msgstr "" msgid "Formats" msgstr "" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "" @@ -587,8 +587,9 @@ msgid "write files to this directory" msgstr ""  #: libbirdfont/ExportUtils.vala:22+#, fuzzy msgid "write svg file"-msgstr ""+msgstr "כתיבת קובץ לוג"  #: libbirdfont/ExportUtils.vala:23 msgid "write ttf and eot file"@@ -618,50 +619,50 @@ msgstr "" msgid "Save font" msgstr "" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr ""  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left" msgstr "" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right" msgstr "" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "" @@ -673,10 +674,6 @@ msgstr "" msgid "Guides" msgstr "" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr ""@@ -705,50 +702,44 @@ msgstr "" msgid "SVG-FILES ..." msgstr "" -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "לא קיים" -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "" -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "לא שם גליף או ערך יוניקוד" -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "" -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "" @@ -764,16 +755,16 @@ msgstr "" msgid "Type “space” to kern the space character and “divis” to kern -." msgstr "" -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "" @@ -785,16 +776,16 @@ msgstr "" msgid "No kerning pairs created." msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "" @@ -806,51 +797,56 @@ msgstr "" msgid "Kerning Tools" msgstr "" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "" -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "" -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "" -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "" -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions" msgstr "" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "" @@ -858,11 +854,7 @@ msgstr "" msgid "Character Set" msgstr "" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer" msgstr "" @@ -903,23 +895,23 @@ msgid "Contextual Substitutions" msgstr ""  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "" @@ -947,19 +939,20 @@ msgstr "" msgid "You need an older version of Birdfont to open it." msgstr "" -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr ""  #: libbirdfont/Menu.vala:37+#, fuzzy msgid "File"-msgstr ""+msgstr "קבצים"  #: libbirdfont/Menu.vala:43 msgid "New" msgstr "" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files" msgstr "" @@ -1007,8 +1000,8 @@ msgstr "" msgid "Move To Baseline" msgstr "" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "" @@ -1080,106 +1073,98 @@ msgstr "" msgid "Export Glyph as SVG" msgstr "" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 msgid "Tab" msgstr "" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 msgid "Next Tab" msgstr "" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 msgid "Previous Tab" msgstr "" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 msgid "Close Tab" msgstr "" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs" msgstr "" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr ""@@ -1213,7 +1198,11 @@ msgstr "" msgid "Menu" msgstr "" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+msgid "Can't create TTF font."+msgstr ""++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "" @@ -1221,27 +1210,31 @@ msgstr "" msgid "Move paths" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "" @@ -1261,11 +1254,15 @@ msgstr "" msgid "Swashes" msgstr "" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr ""++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "" @@ -1286,43 +1283,44 @@ msgstr "" msgid "Yes, don't ask again." msgstr "" -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "" @@ -1338,7 +1336,7 @@ msgstr "" msgid "Add new points" msgstr "" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "" @@ -1354,19 +1352,19 @@ msgstr "" msgid "Generate html document" msgstr "" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 msgid "Glyphs" msgstr "" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 msgid "Backups" msgstr "" @@ -1390,43 +1388,48 @@ msgstr "" msgid "Save?" msgstr "" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "" -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "" -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "אל תתרגם"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "" @@ -1438,287 +1441,291 @@ msgstr "" msgid "Left" msgstr "" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr ""++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "" @@ -1726,7 +1733,7 @@ msgstr "" msgid "Color" msgstr "" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "" @@ -1738,7 +1745,7 @@ msgstr "" msgid "New version" msgstr "" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "" diff --git a/po/id.po b/po/id.poindex 0bf50af..5b8c3f7 100644--- a/po/id.po+++ b/po/id.po@@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-06-01 11:21+0000\n"-"Last-Translator: Dheeta <dita.m.saputri@gmail.com>\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2017-01-29 18:52+0000\n"+"Last-Translator: S <stevro@yahoo.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: id\n" "MIME-Version: 1.0\n"@@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1433157710.000000\n"+"X-POOTLE-MTIME: 1485715930.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"@@ -84,11 +84,16 @@ msgstr "Pilih latar belakang" msgid "Background Image" msgstr "Gambar Latar Belakang" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Pindah, ubah ukuran dan putar gambar latar belakang" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr ""++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Pilih gambar latar belakang" @@ -97,7 +102,7 @@ msgid "Images" msgstr "Gambar"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Berkas" @@ -105,16 +110,16 @@ msgstr "Berkas" msgid "Parts" msgstr "Bagian" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Tambah" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph"-msgstr "Pilih Glyph"+msgstr "Pilih Glif" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Buka"@@ -125,27 +130,24 @@ msgstr ""  #: libbirdfont/BezierTool.vala:95 msgid "line"-msgstr ""+msgstr "garis"  #: libbirdfont/BezierTool.vala:99 msgid "corner" msgstr "" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr ""- #: libbirdfont/CircleTool.vala:36 msgid "Circle"-msgstr ""+msgstr "Lingkaran"  #: libbirdfont/CutBackgroundTool.vala:38+#, fuzzy msgid "Crop background image"-msgstr ""+msgstr "Potong gambar latar belakang"  #: libbirdfont/DefaultCharactersSet.vala:25 msgid "Default Language"-msgstr ""+msgstr "Bahasa Utama"  #: libbirdfont/DefaultCharactersSet.vala:26 msgid "Private Use Area"@@ -153,15 +155,15 @@ msgstr ""  #: libbirdfont/DefaultCharactersSet.vala:28 msgid "Chinese"-msgstr ""+msgstr "Bahasa Mandarin"  #: libbirdfont/DefaultCharactersSet.vala:29 msgid "English"-msgstr ""+msgstr "Bahasa Inggris"  #: libbirdfont/DefaultCharactersSet.vala:30 msgid "Greek"-msgstr ""+msgstr "Bahasa Yunani"  #: libbirdfont/DefaultCharactersSet.vala:31 msgid "Japanese"@@ -188,29 +190,29 @@ msgid "Thai" msgstr "Thailand"  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "a b c d e f g h i j k l m n o p q r s t u v w x y z"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"-msgstr ""+msgstr "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description"-msgstr "Nama dan Perintah"+msgstr "Nama dan Deskripsi"  #: libbirdfont/DescriptionDisplay.vala:70 libbirdfont/MenuTab.vala:98 msgid "PostScript Name" msgstr "Nama PostScript"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name"-msgstr ""+msgstr "Nama"  #: libbirdfont/DescriptionDisplay.vala:90 libbirdfont/MenuTab.vala:108 msgid "Style"@@ -218,45 +220,46 @@ msgstr ""  #: libbirdfont/DescriptionDisplay.vala:100 msgid "Bold"-msgstr ""+msgstr "Cetak tebal"  #: libbirdfont/DescriptionDisplay.vala:109 msgid "Italic"-msgstr ""+msgstr "Cetak miring"  #: libbirdfont/DescriptionDisplay.vala:119 msgid "Weight"-msgstr ""+msgstr "Ketebalan"  #: libbirdfont/DescriptionDisplay.vala:129 libbirdfont/MenuTab.vala:113 msgid "Full Name (Name and Style)" msgstr ""  #: libbirdfont/DescriptionDisplay.vala:140 libbirdfont/MenuTab.vala:118+#, fuzzy msgid "Unique Identifier"-msgstr ""+msgstr "Identifikasi Unik" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Versi"  #: libbirdfont/DescriptionDisplay.vala:160 msgid "Description"-msgstr ""+msgstr "Deskripsi"  #: libbirdfont/DescriptionDisplay.vala:171 msgid "Copyright"-msgstr ""+msgstr "Hak Cipta"  #: libbirdfont/DescriptionDisplay.vala:183 msgid "License"-msgstr ""+msgstr "Lisensi"  #: libbirdfont/DescriptionDisplay.vala:195 msgid "License URL"-msgstr ""+msgstr "URL Lisensi"  #: libbirdfont/DescriptionDisplay.vala:207 msgid "Trademark"@@ -264,15 +267,16 @@ msgstr ""  #: libbirdfont/DescriptionDisplay.vala:219 msgid "Manufacturer"-msgstr ""+msgstr "Manufaktur"  #: libbirdfont/DescriptionDisplay.vala:230 msgid "Designer"-msgstr ""+msgstr "Desainer"  #: libbirdfont/DescriptionDisplay.vala:241+#, fuzzy msgid "Vendor URL"-msgstr ""+msgstr "URL Vendor"  #: libbirdfont/DescriptionDisplay.vala:252 msgid "Designer URL"@@ -283,8 +287,9 @@ msgid "Background Tools" msgstr ""  #: libbirdfont/DrawingTools.vala:113+#, fuzzy msgid "Control Points"-msgstr ""+msgstr "Titik Kendali"  #: libbirdfont/DrawingTools.vala:114 msgid "Object Tools"@@ -310,7 +315,7 @@ msgstr "Sapuan" msgid "Geometrical Shapes" msgstr "Bentuk Geometri" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "Perbesar" @@ -322,12 +327,16 @@ msgstr "Pedoman & Kisi-kisi" msgid "Grid Size" msgstr "Ukuran Kisi/kotak" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "Pindahkan kanvas" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -343,202 +352,214 @@ msgid "Undo" msgstr ""  #: libbirdfont/DrawingTools.vala:234+#, fuzzy msgid "Insert new points on path"-msgstr ""+msgstr "Tambahkan titik baru di jalur" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate"-msgstr ""+msgstr "Koordinat X" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate"-msgstr ""+msgstr "Koordinat Y" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation"-msgstr ""+msgstr "Rotasi" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "Lebar" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "Tinggi" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Ikat lengkungan pegangan untuk titik sunting yang dipilih" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "Pegangan simetris" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Mengubah ruas ke garis." -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Membuat loket dari garis besar" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path" msgstr "Tutup jalur" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598+#, fuzzy msgid "Move to path to the bottom of the layer"-msgstr ""+msgstr "Pindah ke jalur untuk lapisan bawah " -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612+#, fuzzy msgid "Flip path vertically"-msgstr "Balik jalur secara tegak lurus"+msgstr "Balik jalur secara vertikal" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620+#, fuzzy msgid "Flip path horizontally"-msgstr ""+msgstr "Balik jalur secara horizontal" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667+#, fuzzy msgid "Show/hide background image"-msgstr ""+msgstr "Tampilkan/sembunyikan gambar latar belakang" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678+#, fuzzy msgid "Insert a new background image"-msgstr ""+msgstr "Tambahkan gambar latar belakang baru" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast"-msgstr ""+msgstr "Kontras Tinggi" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706+#, fuzzy msgid "Set background threshold"-msgstr ""+msgstr "Tetapkan batas latar belakang" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725+#, fuzzy msgid "Amount of autotrace details"-msgstr ""+msgstr "Jumlah detil autotrace" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744+#, fuzzy msgid "Autotrace simplification"-msgstr ""+msgstr "Penyederhanaan autotrace" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754+#, fuzzy msgid "Autotrace background image"-msgstr ""+msgstr "Gambar latar belakang autotrace" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762+#, fuzzy msgid "Delete background image"-msgstr ""+msgstr "Hapus gambar latar belakang" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769+#, fuzzy msgid "Add layer"-msgstr ""+msgstr "Tambah Lapisan" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779+#, fuzzy msgid "Show layers"-msgstr ""+msgstr "Tampilkan Lapisan" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "Terapkan sapuan" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Lebar sapuan" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "Membuat garis besar dari sapuan" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "Penutup baris belakang" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "Penutup baris bulat" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "Penutup baris kotak" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Tampilkan pedoman" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines" msgstr "Tampilkan lebih banyak pedoman" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "Tampilkan pedoman di batas atas dan bawah " -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044+#, fuzzy msgid "Lock guides and grid"-msgstr ""+msgstr "Kunci garis bantu" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "Lebih Memperbesar Keluar" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph"-msgstr ""+msgstr "Tampilkan seluruh glif" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104+#, fuzzy msgid "Fit in view"-msgstr ""+msgstr "Sesuaikan tampilan" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view"-msgstr ""+msgstr "Tampilan sebelumnya" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view"-msgstr ""+msgstr "Tampilan selanjutnya" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535+#, fuzzy msgid "Set size for grid"-msgstr ""+msgstr "Tetapkan ukuran grid"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309+#, fuzzy msgid "Export Settings"-msgstr ""+msgstr "Pengaturan ekspor"  #: libbirdfont/ExportSettings.vala:45 libbirdfont/ExportSettings.vala:60 msgid "File Name"@@ -546,54 +567,58 @@ msgstr "Nama Berkas"  #: libbirdfont/ExportSettings.vala:75 msgid "Units Per Em"-msgstr ""+msgstr "Satuan Per Em" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77+#, fuzzy msgid "Folder"-msgstr ""+msgstr "Berkas"  #: libbirdfont/ExportSettings.vala:98 msgid "Formats" msgstr "Bentuk" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "Menambahkan" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Menyimpan" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet"-msgstr ""+msgstr "Alfabet"  #: libbirdfont/ExportUtils.vala:17 libbirdfont/ImportUtils.vala:17 #: birdfont-autotrace/AutoTrace.vala:66+#, fuzzy msgid "Usage:"-msgstr ""+msgstr "Pemakaian"  #: libbirdfont/ExportUtils.vala:20 birdfont-autotrace/AutoTrace.vala:71 msgid "print this message" msgstr "Cetak pesan ini"  #: libbirdfont/ExportUtils.vala:21+#, fuzzy msgid "write files to this directory"-msgstr ""+msgstr "tulis berkas di direktori ini"  #: libbirdfont/ExportUtils.vala:22 msgid "write svg file"-msgstr ""+msgstr "tulis berkas svg"  #: libbirdfont/ExportUtils.vala:23 msgid "write ttf and eot file"-msgstr ""+msgstr "tulis berkas ttf dan eot"  #: libbirdfont/ExportUtils.vala:130+#, fuzzy msgid "Can't find output directory"-msgstr ""+msgstr "Tidak dapat menemukan direktori output"  #: libbirdfont/FileDialogTab.vala:79 msgid "Select a Folder"@@ -615,52 +640,52 @@ msgstr "Buka huruf" msgid "Save font" msgstr "Simpan huruf" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr "Pengaturan"  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes"-msgstr ""+msgstr "Tema" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin"-msgstr ""+msgstr "margin atas" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top"-msgstr ""+msgstr "atas" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height"-msgstr ""+msgstr "tinggi x" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline"-msgstr ""+msgstr "garis basis" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom"-msgstr ""+msgstr "bawah" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin"-msgstr ""+msgstr "margin bawah" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left"-msgstr ""+msgstr "kiri" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right"-msgstr ""+msgstr "kanan" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide"-msgstr ""+msgstr "Panduan"  #: libbirdfont/GridTool.vala:38 msgid "Show grid"@@ -670,10 +695,6 @@ msgstr "" msgid "Guides" msgstr "" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr ""@@ -695,57 +716,53 @@ msgid "Move handle along axis" msgstr ""  #: libbirdfont/ImportUtils.vala:19+#, fuzzy msgid "BF-FILE"-msgstr ""+msgstr "BERKAS-BF"  #: libbirdfont/ImportUtils.vala:19+#, fuzzy msgid "SVG-FILES ..."-msgstr ""+msgstr "BERKAS-SVG" -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist."-msgstr ""+msgstr "tidak ada." -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created."-msgstr ""+msgstr "Font baru akan dibuat." -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "Gagal dalam memasukkan" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "Membatalkan" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "bukan nama dari glyph atau nilai Standar Kode." -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "Nilai standar kode harus dimulai dengan U+." -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "Menambahkan" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "pada" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "Glyph" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "" @@ -764,16 +781,16 @@ msgid "Type “space” to kern the space character and “divis” to kern -." msgstr "" "Ketik \"ruang\" untuk pangkal karakter ruang dan \"divis\" untuk pangkal -." -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "Standar kode" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "Sisipkan" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Tutup" @@ -785,16 +802,16 @@ msgstr "Sepasang pangkal" msgid "No kerning pairs created." msgstr "Tidak ada sepasang pangkal yang dibuat." -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "Kelas pangkal" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Atur" @@ -806,51 +823,58 @@ msgstr "Memuat tali pangkal" msgid "Kerning Tools" msgstr "" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size"-msgstr ""+msgstr "Ukuran Huruf" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "" -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "" -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151+#, fuzzy msgid "You have reached the beginning of the list."-msgstr ""+msgstr "Kamu telah mencapai akhir dari daftar." -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160+#, fuzzy msgid "Next kerning string"-msgstr ""+msgstr "Memuat tali pangkal" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "Kamu telah mencapai akhir dari daftar." -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions"-msgstr ""+msgstr "Substitusi" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "Mengatur Karakter" @@ -858,11 +882,7 @@ msgstr "Mengatur Karakter" msgid "Character Set" msgstr "Mengatur Karakter" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer" msgstr "" @@ -895,59 +915,66 @@ msgid "New Ligature" msgstr "Pengikat Baru"  #: libbirdfont/LigatureList.vala:109+#, fuzzy msgid "New Contextual Substitution"-msgstr ""+msgstr "Substitusi Kontekstual Baru"  #: libbirdfont/LigatureList.vala:115 msgid "Contextual Substitutions" msgstr ""  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437+#, fuzzy msgid "Ligatures"-msgstr ""+msgstr "Ligature" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning"-msgstr ""+msgstr "Awal" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle"-msgstr ""+msgstr "Tengah" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End"-msgstr ""+msgstr "Akhir" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188+#, fuzzy msgid "Ligature"-msgstr ""+msgstr "Ligature"  #: libbirdfont/Line.vala:157 msgid "Position"-msgstr ""+msgstr "Posisi"  #: libbirdfont/Line.vala:157 msgid "Move"-msgstr ""+msgstr "Pindah"  #: libbirdfont/LoadCallback.vala:29+#, fuzzy msgid "This font was made with a newer version of Birdfont."-msgstr ""+msgstr "Font ini dibuat dengan versi Birdfont yang lebih baru."  #: libbirdfont/LoadCallback.vala:30+#, fuzzy msgid "You need to upgrade your version of Birdfont."-msgstr ""+msgstr "Anda harus mengupgrade versi Birdfont."  #: libbirdfont/LoadCallback.vala:34+#, fuzzy msgid "This font was made with an old version of Birdfont."-msgstr ""+msgstr "Font ini dibuat dengan Birdfont versi lama."  #: libbirdfont/LoadCallback.vala:35+#, fuzzy msgid "You need an older version of Birdfont to open it."-msgstr ""+msgstr "Anda perlu Birdfont versi lama untuk membukanya." -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "" @@ -959,7 +986,7 @@ msgstr "Berkas" msgid "New" msgstr "Baru" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files" msgstr "Berkas Terkini" @@ -985,7 +1012,7 @@ msgstr "Mengulang"  #: libbirdfont/Menu.vala:113 msgid "Copy"-msgstr "Menyalin"+msgstr "Salin"  #: libbirdfont/Menu.vala:120 msgid "Paste"@@ -996,33 +1023,37 @@ msgid "Paste In Place" msgstr ""  #: libbirdfont/Menu.vala:134+#, fuzzy msgid "Select All Paths"-msgstr ""+msgstr "Pilih Semua Jalur"  #: libbirdfont/Menu.vala:141 msgid "Select All Glyphs"-msgstr ""+msgstr "Pilih Semua Glif"  #: libbirdfont/Menu.vala:148 msgid "Move To Baseline"-msgstr ""+msgstr "Pindah ke Garis Basis" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search"-msgstr ""+msgstr "Cari"  #: libbirdfont/Menu.vala:162+#, fuzzy msgid "Simplify Path"-msgstr ""+msgstr "Sederhanakan Jalur"  #: libbirdfont/Menu.vala:169+#, fuzzy msgid "Merge Paths"-msgstr ""+msgstr "Gabungkan Jalur"  #: libbirdfont/Menu.vala:176+#, fuzzy msgid "Close Path"-msgstr ""+msgstr "Tutup jalur"  #: libbirdfont/Menu.vala:183 msgid "Glyph Sequence"@@ -1033,12 +1064,13 @@ msgid "Set Background Glyph" msgstr ""  #: libbirdfont/Menu.vala:197+#, fuzzy msgid "Remove Background Glyph"-msgstr ""+msgstr "Hapus Background Glif"  #: libbirdfont/Menu.vala:204 msgid "Create Guide"-msgstr ""+msgstr "Buat Garis Bantu"  #: libbirdfont/Menu.vala:211 msgid "List Guides"@@ -1061,12 +1093,14 @@ msgid "Select Point Below" msgstr "Pilih Titik Bawah"  #: libbirdfont/Menu.vala:253+#, fuzzy msgid "Move Layer Up"-msgstr ""+msgstr "Geser Layer Ke Atas"  #: libbirdfont/Menu.vala:260+#, fuzzy msgid "Move Layer Down"-msgstr ""+msgstr "Geser Layer Ke Bawah"  #: libbirdfont/Menu.vala:268 msgid "Import and Export"@@ -1080,195 +1114,213 @@ msgstr "Menambahkan Huruf" msgid "Export Glyph as SVG" msgstr "Menambahkan Glyph sebagai SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "Memasukkan berkas SVG" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "Memasukkan berkas SVG" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview"-msgstr ""+msgstr "Pratinjau" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 msgid "Tab" msgstr "" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330+#, fuzzy msgid "Next Tab"-msgstr ""+msgstr "Tab Berikutnya" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337+#, fuzzy msgid "Previous Tab"-msgstr ""+msgstr "Tab Sebelumnya" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344+#, fuzzy msgid "Close Tab"-msgstr ""+msgstr "Tutup Tab" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs" msgstr "Tutup semua tab" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421+#, fuzzy msgid "Load Kerning Strings"-msgstr ""+msgstr "Memuat tali pangkal" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428+#, fuzzy msgid "Reload Kerning Strings"-msgstr ""+msgstr "Memuat tali pangkal" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443+#, fuzzy msgid "Show Ligatures"-msgstr ""+msgstr "Perlihatkan Ligature" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450+#, fuzzy msgid "Add Ligature"-msgstr ""+msgstr "Pengikat Baru" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git"-msgstr ""+msgstr "Git" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp"-msgstr ""+msgstr "Simpan Sebagai .bfp" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview"-msgstr ""--#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""+msgstr "Tinjauan"  #: libbirdfont/MenuItem.vala:82 msgid "UP"-msgstr ""+msgstr "ATAS"  #: libbirdfont/MenuItem.vala:85 msgid "DOWN"-msgstr ""+msgstr "BAWAH"  #: libbirdfont/MenuItem.vala:88 msgid "LEFT"-msgstr ""+msgstr "KIRI"  #: libbirdfont/MenuItem.vala:91 msgid "RIGHT"-msgstr ""+msgstr "KANAN"  #: libbirdfont/MenuTab.vala:95+#, fuzzy msgid "Missing metadata in font:"-msgstr ""+msgstr "Metadata hilang dalam font:"  #: libbirdfont/MenuTab.vala:128+#, fuzzy msgid "" "You need to choose a different name for the TTF file with Mac adjustmets."-msgstr ""+msgstr "Pilih nama berbeda untuk berkas TTF dengan penyesuaian Mac."  #: libbirdfont/MenuTab.vala:146+#, fuzzy msgid "You need to save your font before exporting it."-msgstr ""+msgstr "Anda harus menyimpan font sebelum mengekspornya."  #: libbirdfont/MenuTab.vala:189 msgid "Menu"+msgstr "Menu"++#: libbirdfont/MenuTab.vala:216+msgid "Can't create TTF font." msgstr "" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702+#, fuzzy msgid "Add ligature"-msgstr ""+msgstr "Pengikat Baru"  #: libbirdfont/MoveTool.vala:41+#, fuzzy msgid "Move paths"-msgstr ""+msgstr "Pindah Jalur" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions"-msgstr ""+msgstr "Substitusi Glif" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph"-msgstr ""+msgstr "Glif baru" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement"-msgstr ""+msgstr "Pengganti" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181-msgid "Glyph name"+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for." msgstr "" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:218+msgid "Glyph name"+msgstr "Nama Glif"++#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names."-msgstr ""+msgstr "Semua glif harus punya nama unik."  #: libbirdfont/OtfLabel.vala:47+#, fuzzy msgid "Stylistic Alternate"-msgstr ""+msgstr "Gaya Alternatif"  #: libbirdfont/OtfLabel.vala:49 msgid "Small Caps"-msgstr ""+msgstr "Huruf Kecil"  #: libbirdfont/OtfLabel.vala:51+#, fuzzy msgid "Capitals to Small Caps"-msgstr ""+msgstr "Huruf Kapital ke Huruf Kecil"  #: libbirdfont/OtfLabel.vala:53 msgid "Swashes" msgstr "" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "" -#: libbirdfont/OverView.vala:1498-msgid "See also:"+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view." msgstr "" +#: libbirdfont/OverView.vala:1562+msgid "See also:"+msgstr "Lihat juga:"+ #: libbirdfont/OverWriteDialogListener.vala:30 msgid "Overwrite TTF file?" msgstr ""@@ -1280,99 +1332,107 @@ msgstr "" #: libbirdfont/OverWriteDialogListener.vala:32 #: libbirdfont/OverwriteBfFile.vala:34 libbirdfont/SaveDialog.vala:50 msgid "Cancel"-msgstr ""+msgstr "Batalkan"  #: libbirdfont/OverWriteDialogListener.vala:33 msgid "Yes, don't ask again."-msgstr ""+msgstr "Ya, jangan tanya lagi." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72+#, fuzzy msgid "Default"-msgstr ""+msgstr "Bawaan" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "Condong" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize"-msgstr ""+msgstr "Ubah Ukuran" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate"-msgstr ""+msgstr "Buat alternatif" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172+#, fuzzy msgid "Set curve orientation"-msgstr ""+msgstr "Tetapkan orientasi curve" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194+#, fuzzy msgid "Master Size"-msgstr ""+msgstr "Ukuran Utama" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr ""  #: libbirdfont/OverwriteBfFile.vala:25+#, fuzzy msgid "This file already exists. Do you want to replace it?"-msgstr ""+msgstr "Berkas ini sudah ada. Apakah Anda ingin menimpanya?"  #: libbirdfont/OverwriteBfFile.vala:27 msgid "Replace"-msgstr ""+msgstr "Ganti"  #: libbirdfont/PenTool.vala:82 msgid "Add new points"-msgstr ""+msgstr "Tambah titik baru" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84+#, fuzzy msgid "Move control points"-msgstr ""+msgstr "Pindah titik kontrol"  #: libbirdfont/PreviewTools.vala:27 msgid "Reload webview" msgstr ""  #: libbirdfont/PreviewTools.vala:33+#, fuzzy msgid "Export fonts"-msgstr ""+msgstr "Ekspor font"  #: libbirdfont/PreviewTools.vala:39 msgid "Generate html document" msgstr "" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66+#, fuzzy msgid "No fonts created yet"-msgstr ""+msgstr "Belum ada font yang dibuat" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font"-msgstr ""+msgstr "Buat Font Baru" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 msgid "Glyphs"-msgstr ""+msgstr "Glif" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 msgid "Backups" msgstr ""  #: libbirdfont/RectangleTool.vala:30 msgid "Rectangle"-msgstr ""+msgstr "Bujur Sangkar"  #: libbirdfont/ResizeTool.vala:49 msgid "Resize and rotate paths"@@ -1380,53 +1440,59 @@ msgstr ""  #: libbirdfont/SaveDialog.vala:36 msgid "Save changes?"-msgstr ""+msgstr "Simpan perubahan?"  #: libbirdfont/SaveDialog.vala:44 libbirdfont/SaveDialogListener.vala:30 msgid "Discard"-msgstr ""+msgstr "Singkirkan"  #: libbirdfont/SaveDialogListener.vala:28 msgid "Save?"-msgstr ""+msgstr "Simpan?" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82+#, fuzzy msgid "Precision for pen tool"-msgstr ""+msgstr "Ketepatan untuk pen tool" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "" -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "" -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "Jangan diterjemahkan"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme"-msgstr ""+msgstr "Warna tema" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character"-msgstr ""+msgstr "Karakter" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "" @@ -1436,297 +1502,304 @@ msgstr ""  #: libbirdfont/SpacingTab.vala:232 msgid "Left"-msgstr ""+msgstr "Kiri" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right"+msgstr "Kanan"++#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import" msgstr "" -#: libbirdfont/Theme.vala:421+#: libbirdfont/Theme.vala:419+#, fuzzy msgid "Canvas Background"-msgstr ""+msgstr "Latar Belakang Kanvas" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1"-msgstr ""+msgstr "Latar Belakang 1" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427+#, fuzzy msgid "Dialog Background"-msgstr ""+msgstr "Latar Belakang Dialog" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background"-msgstr ""+msgstr "Latar Belakang Menu" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge"-msgstr ""+msgstr "Gabung" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501+#, fuzzy msgid "Font Name"-msgstr ""+msgstr "Nama Font" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme"-msgstr ""+msgstr "Tema baru" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme"-msgstr ""+msgstr "Tambah tema baru" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors"-msgstr ""+msgstr "Warna" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark"-msgstr ""+msgstr "Gelap" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright"-msgstr ""+msgstr "Terang" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr ""  #: libbirdfont/ThemeTools.vala:30 msgid "Color"-msgstr ""+msgstr "Warna" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "" @@ -1736,9 +1809,9 @@ msgstr ""  #: libbirdfont/VersionList.vala:51 msgid "New version"-msgstr ""+msgstr "Versi baru" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "" @@ -1760,15 +1833,15 @@ msgstr ""  #: birdfont-autotrace/AutoTrace.vala:92 msgid "File does not exist."-msgstr ""+msgstr "Berkas tidak ada."  #: birdfont-autotrace/AutoTrace.vala:98 msgid "Unknown file format."-msgstr ""+msgstr "Format berkas tidak diketahui."  #: birdfont-autotrace/AutoTrace.vala:114 msgid "Writing"-msgstr ""+msgstr "Penulisan"  #~ msgid "Move to path to the bottom layer" #~ msgstr "Pindah ke jalur untuk lapisan bawah "diff --git a/po/it.po b/po/it.poindex 975c840..8c0784f 100644--- a/po/it.po+++ b/po/it.po@@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-11-20 08:49+0000\n"-"Last-Translator: Anonymous Pootle User\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2017-05-17 08:36+0000\n"+"Last-Translator: daniele_translator <daniel.translator@mail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: it\n" "MIME-Version: 1.0\n"@@ -16,11 +16,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1448009351.000000\n"+"X-POOTLE-MTIME: 1495010211.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"-msgstr "Uso"+msgstr "Utilizzo"  #: libbirdfont/Argument.vala:279 libbirdfont/ExportUtils.vala:19 #: birdfont-autotrace/AutoTrace.vala:68@@ -34,7 +34,7 @@ msgstr "OPZIONE"  #: libbirdfont/Argument.vala:281 msgid "enable Android customizations"-msgstr "abilita le personalizzazioni Android"+msgstr "abilita la personalizzazione per Android"  #: libbirdfont/Argument.vala:282 msgid "show coordinate in glyph view"@@ -68,27 +68,34 @@ msgstr "abilita personalizzazioni Windows" msgid "don't translate" msgstr "non tradurre" +# suite e' da lasciare invariato, come da word list https://ddtp2.debian.net/ddtss/index.cgi/it/wordlist #: libbirdfont/Argument.vala:290 msgid "sleep between each command in test suite"-msgstr "metti in pausa prima di ogni comando in modalità test"+msgstr "metti in pausa prima di ogni comando della suite di test"  #: libbirdfont/Argument.vala:291 msgid "run test case"-msgstr "esegui test"+msgstr "esegui un test"  #: libbirdfont/BackgroundSelectionTool.vala:23 msgid "Select background" msgstr "Seleziona lo sfondo" +# "sfondo" in minuscolo (Gli inglesi usano mettere ogni prima lettera di un titolo in maiuscolo, in Italia non si usa) #: libbirdfont/BackgroundTab.vala:47 libbirdfont/BackgroundTools.vala:26 msgid "Background Image"-msgstr "Immagine di Sfondo"+msgstr "Immagine di sfondo" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Muovi, ridimensiona e ruota l'immagine di sfondo" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr "sull'asse"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Seleziona l'immagine di sfondo" @@ -97,7 +104,7 @@ msgid "Images" msgstr "Immagini"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "File" @@ -105,16 +112,16 @@ msgstr "File" msgid "Parts" msgstr "Parti" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Aggiungi" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "Seleziona glifo" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Apri"@@ -131,10 +138,6 @@ msgstr "linea" msgid "corner" msgstr "angolo" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr "sull'asse"- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "Cerchio"@@ -188,18 +191,18 @@ msgid "Thai" msgstr "Tailandese"  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "a b c d e f g h i j k l m n o p q r s t u v w x y z"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description" msgstr "Nome e descrizione" @@ -208,7 +211,7 @@ msgid "PostScript Name" msgstr "Nome PostScript"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Nome" @@ -226,7 +229,7 @@ msgstr "Corsivo"  #: libbirdfont/DescriptionDisplay.vala:119 msgid "Weight"-msgstr "Peso"+msgstr "Spessore"  #: libbirdfont/DescriptionDisplay.vala:129 libbirdfont/MenuTab.vala:113 msgid "Full Name (Name and Style)"@@ -236,9 +239,9 @@ msgstr "Nome completo (nome e stile)" msgid "Unique Identifier" msgstr "Identificativo univoco" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Versione" @@ -278,9 +281,10 @@ msgstr "URL Produttore" msgid "Designer URL" msgstr "URL Progettista" +# tools -> strumenti #: libbirdfont/DrawingTools.vala:112 msgid "Background Tools"-msgstr "Strumento per lo sfondo"+msgstr "Strumenti per lo sfondo"  #: libbirdfont/DrawingTools.vala:113 msgid "Control Points"@@ -310,7 +314,7 @@ msgstr "Tratto" msgid "Geometrical Shapes" msgstr "Forme geometriche" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "Ingrandimento" @@ -322,12 +326,16 @@ msgstr "Linee guida e griglia" msgid "Grid Size" msgstr "Dimensione della griglia" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "Sposta area di lavoro" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -346,197 +354,192 @@ msgstr "Annulla" msgid "Insert new points on path" msgstr "Inserisci nuovi punti sul percorso" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "Crea curve quadratiche di Bézier" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "Crea curve cubiche di Bézier" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "Tracciato quadrato con due linee maniglia" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Converti i punti selezionati" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "coordinata X" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "coordinata Y" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "Rotazione" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "Larghezza" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height"-msgstr "Peso"+msgstr "Altezza" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Lega le maniglie della curva al punto di modifica selezionato" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "Maniglie simmetriche" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Converti il segmento in linea." -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Crea sagoma personalizzata" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline"-msgstr ""+msgstr "Scala l'oggetto per adattarlo alla linea di base" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path" msgstr "Chiudi il percorso" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 msgid "Move to path to the bottom of the layer" msgstr "Muovi dal percorso al livello in fondo" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Ribalta tracciato verticalmente" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Ribalta tracciato orizzontalmente" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "Imposta le dimensioni per l'immagine di sfondo" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "Mostra/nascondi l'immagine di sfondo" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Inserisci una nuova immagine di sfondo" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "Alto contrasto" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "Stabilisci soglia di sfondo" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "Numero di dettagli automatici" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "Semplificazione automatica" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "Immagine di sfondo automatica" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "Elimina l'immagine di sfondo" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "Aggiungi livello" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "Mostra i livelli" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "Applica tratto" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Larghezza contorno" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "Crea contorno dal tratto" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "Estremità troncata" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "Estremità arrotondata" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "Estremità quadrata" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Mostra linee guida" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines" msgstr "Mostra più linee guida" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "Mostra linee guida al margine superiore e inferiore" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "Blocca le guide e la griglia" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "Ingrandisci ancora" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "Mostra glifo completo" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "Adatta alla finestra" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "Ingrandisci su immagine dello sfondo" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view"-msgstr "Articolo precedente"+msgstr "Vista precedente" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Vista successiva" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Imposta la dimensione della griglia"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "Esporta impostazioni" @@ -548,7 +551,7 @@ msgstr "Nome del file" msgid "Units Per Em" msgstr "Unità per Em" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "Cartella" @@ -556,17 +559,17 @@ msgstr "Cartella" msgid "Formats" msgstr "Formati" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "Esportare" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Salva" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "Alfabeto" @@ -605,7 +608,7 @@ msgstr "Cartelle"  #: libbirdfont/FileTools.vala:31 msgid "New font"-msgstr "Nova fonte"+msgstr "Nuova fonte"  #: libbirdfont/FileTools.vala:37 msgid "Open font"@@ -615,50 +618,51 @@ msgstr "Apri carattere" msgid "Save font" msgstr "Salva il carattere" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr "Impostazioni"  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "Temi" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "margine superiore" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "alto" -#: libbirdfont/Glyph.vala:616+# altezza coordinata X+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "x-altezza" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "linea di base" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "basso" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "margine inferiore" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left" msgstr "sinistro/a" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right" msgstr "destra" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "Guida" @@ -670,10 +674,6 @@ msgstr "Mostra la griglia" msgid "Guides" msgstr "Guide" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr "Aumenta ingrandimento"@@ -692,7 +692,7 @@ msgstr "Converti l'ultimo punto di controllo in un nodo angolare"  #: libbirdfont/HiddenTools.vala:63 msgid "Move handle along axis"-msgstr "Muovi la maniglia l'ungo l'asse"+msgstr "Muovi la maniglia lungo l'asse"  #: libbirdfont/ImportUtils.vala:19 msgid "BF-FILE"@@ -702,56 +702,50 @@ msgstr "FILE-BF" msgid "SVG-FILES ..." msgstr "FILES-SVG ..." -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "non esiste." -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "Verrà creato un nuovo carattere." -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "Importazione fallita" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "Uscita forzata" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "non è il nome di un glifo o di un valore Unicode." -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "I valori Unicode devono iniziare con U+." -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "Aggiungi" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "a" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "Glifo" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Crenatura"  #: libbirdfont/KerningDisplay.vala:109 msgid "The current kerning class is malformed."-msgstr "La classe di crenatura corrente è deforme"+msgstr "La classe di crenatura corrente è deforme."  #: libbirdfont/KerningDisplay.vala:110 msgid "Add single characters separated by space and ranges on the form A-Z."@@ -764,16 +758,16 @@ msgstr "" "Digita \"space\" per la crenatura del carattere spazio e \"divis\" per la " "crenatura del carattere -." -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "Unicode" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "Inserisci" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Chiudi" @@ -785,16 +779,16 @@ msgstr "Coppie Crenatura" msgid "No kerning pairs created." msgstr "Non sono state create coppie di crenatura." -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "Classe di crenatura" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Imposta" @@ -806,69 +800,71 @@ msgstr "Carica le stringhe di crenatura" msgid "Kerning Tools" msgstr "Strumenti di crenatura" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "Dimensione carattere" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class."-msgstr "Crea una nuova classe di crenatura"+msgstr "Crea una nuova classe di crenatura." -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values."-msgstr "Usa input di testo per inserire valori di crenatura"+msgstr "Usa input di testo per inserire valori di crenatura." -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "Inserisci il glifo dalla panoramica" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "Inserisci un carattere col codice Unicode" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "Apri un documento di testo con le stringhe di crenatura all'inizio." -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "Stringa di crenatura precedente" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "Hai raggiunto l'inizio della lista." -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "Stringa di crenatura successiva" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "Hai raggiunto la fine della lista." -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions" msgstr "Sostituzioni" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "Tipi di carattere" +# Tipo di carattere #: libbirdfont/LanguageSelectionTab.vala:68 msgid "Character Set" msgstr "Set caratteri" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer" msgstr "Livello"  #: libbirdfont/LigatureList.vala:53 msgid "character sequence"-msgstr "sequenze di caratteri"+msgstr "sequenza di caratteri"  #: libbirdfont/LigatureList.vala:53 msgid "ligature"@@ -880,8 +876,9 @@ msgstr "sostituzione"  #: libbirdfont/LigatureList.vala:56 msgid "beginning"-msgstr "Inizio"+msgstr "inizio" +# centro #: libbirdfont/LigatureList.vala:56 msgid "middle" msgstr "medio"@@ -892,7 +889,7 @@ msgstr "fine"  #: libbirdfont/LigatureList.vala:109 msgid "New Ligature"-msgstr "Nuova Legatura"+msgstr "Nuova legatura"  #: libbirdfont/LigatureList.vala:109 msgid "New Contextual Substitution"@@ -903,23 +900,23 @@ msgid "Contextual Substitutions" msgstr "Sostituzioni contestuali"  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "Legature" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "Inizio" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "Centro" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "Fine" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "Legatura" @@ -929,7 +926,7 @@ msgstr "Posizione"  #: libbirdfont/Line.vala:157 msgid "Move"-msgstr "_Sposta"+msgstr "Sposta"  #: libbirdfont/LoadCallback.vala:29 msgid "This font was made with a newer version of Birdfont."@@ -949,7 +946,7 @@ msgstr "" msgid "You need an older version of Birdfont to open it." msgstr "Dovresti avere una versione meno recente di Birdfont per aprirlo." -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Sequenza glifi" @@ -961,7 +958,7 @@ msgstr "File" msgid "New" msgstr "Nuovo" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files" msgstr "File recenti" @@ -1009,8 +1006,8 @@ msgstr "Seleziona tutti i glifi" msgid "Move To Baseline" msgstr "Muovi alla linea di base" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "Cerca" @@ -1082,106 +1079,98 @@ msgstr "Esporta caratteri" msgid "Export Glyph as SVG" msgstr "Esporta il Glifo come SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "Importa un file SVG" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "Importa una cartella SVG" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "Importa un'immagine di sfondo" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "Anteprima" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 msgid "Tab" msgstr "Tabulazione" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 msgid "Next Tab" msgstr "Scheda successiva" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 msgid "Previous Tab" msgstr "Scheda precedente" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 msgid "Close Tab" msgstr "Chiudi la scheda" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs" msgstr "Chiudi tutte le schede" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "Spaziatura e crenatura" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "Mostra il tabulatore della spaziatura" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "Mostra il tabulatore della crenatura" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "Lista coppie di crenatura" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "Classi di spaziatura" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "Seleziona la coppia di crenatura successiva" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "Seleziona la coppia di crenatura precedente" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "Carica le stringhe di crenatura" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "Ricarica le stringhe di crenatura" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "Mostra le legature" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "Aggiungi la legatura" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "Git" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "Salva come .bfp" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Panoramica" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr "SU"@@ -1217,38 +1206,48 @@ msgstr "Devi salvare il tuo carattere prima di esportarlo." msgid "Menu" msgstr "Menu" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+#, fuzzy+msgid "Can't create TTF font."+msgstr "Criar uma nova fonte"++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "Aggiungi legatura"  #: libbirdfont/MoveTool.vala:41 msgid "Move paths"-msgstr "Sposta tracciati"+msgstr "Sposta i tracciati" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "Sostituzioni Glifi" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "Nuovo glifo" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement"-msgstr "sostituzione"+msgstr "Sostituzione" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag"-msgstr "etichetta"+msgstr "Etichetta"++#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "Nome del glifo" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names."-msgstr "Tutti i glifi devono avere nomi diversi"+msgstr "Tutti i glifi devono avere nomi diversi." +# Stile alternato o stile alterno #: libbirdfont/OtfLabel.vala:47 msgid "Stylistic Alternate" msgstr "Alternativa di stile"@@ -1257,25 +1256,31 @@ msgstr "Alternativa di stile" msgid "Small Caps" msgstr "Maiuscoletto" +# trasforma in Maiuscoletto #: libbirdfont/OtfLabel.vala:51 msgid "Capitals to Small Caps" msgstr "Maiuscole a Maiuscoletto"  #: libbirdfont/OtfLabel.vala:53 msgid "Swashes"-msgstr "ornature"+msgstr "Ornature" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "Filtro" -#: libbirdfont/OverView.vala:1498+# May be better to use vista or schermata+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr "Nessun glifo in questa vista."++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "Vedi anche:"  #: libbirdfont/OverWriteDialogListener.vala:30 msgid "Overwrite TTF file?"-msgstr "Sovrascrivere File TTF?"+msgstr "Sovrascrivere file TTF?"  #: libbirdfont/OverWriteDialogListener.vala:31 msgid "Overwrite"@@ -1290,45 +1295,46 @@ msgstr "Annulla" msgid "Yes, don't ask again." msgstr "Si, non chiederlo più." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "Trasforma" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master"-msgstr ""+msgstr "Multimaster" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "Tutti i glifi" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "Predefinito" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "Distorsione" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "Ridimensiona" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate"-msgstr "crea un'alternativa"+msgstr "Crea alternato" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "Imposta l'orientamento della curva" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size"-msgstr ""+msgstr "Dimensione del master" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font"-msgstr ""+msgstr "Crea un nuovo font master"  #: libbirdfont/OverwriteBfFile.vala:25 msgid "This file already exists. Do you want to replace it?"@@ -1342,10 +1348,11 @@ msgstr "Sostituisci" msgid "Add new points" msgstr "Aggiungi nuovi punti" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "Sposta i punti di controllo" +# Ricarica la vista (vista web) #: libbirdfont/PreviewTools.vala:27 msgid "Reload webview" msgstr "Ricarica la Webview"@@ -1358,19 +1365,19 @@ msgstr "Esporta caratteri" msgid "Generate html document" msgstr "Crea un documento HTML" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "Non è stato creato ancora alcun carattere" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "Crea un nuovo carattere" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 msgid "Glyphs" msgstr "Glifi" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 msgid "Backups" msgstr "Archivi" @@ -1394,43 +1401,49 @@ msgstr "Scarta" msgid "Save?" msgstr "Salvare?" -#: libbirdfont/SettingsTab.vala:80+# Precisione per lo strumento penna+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "Strumento di precisione per la penna" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "Mostra o nascondi le maniglie di controllo del punto" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "Chiudi i tracciati rimasti aperti." -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units."-msgstr "Usa unità TTF"+msgstr "Usa unità TTF." -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "Numero di punti aggiunti dallo strumento a mano libera" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "Soglia del percorso di semplificazione" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "non tradurre"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme"-msgstr "Colora il tema"+msgstr "Tema dei colori" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings"-msgstr "Combinazione dei tasti"+msgstr "Combinazioni di tasti" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "Carattere" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "Nuova classe di spaziatura" @@ -1442,287 +1455,291 @@ msgstr "Spaziatura" msgid "Left" msgstr "Sinistra" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "Destra" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "Importa"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "Sfondo della tela" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "Tratto ripieno" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "Colore del tratto" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "Colore della maniglia" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "Riempi colore" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "Oggetti selezionati" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "Sfondo 1" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "Sfondo del dialogo" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "Sfondo del menù" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "Sfondo predefinito" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "Sfondo a scacchiera" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "Primo piano 1" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "Testo in rilievo" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "Bordo della tavola" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "Selezione bordo" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "Panoramica del glifo" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "Primo piano invertito" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "Menù primo piano" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "Primo piano del pannello selezionato" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "Separatore del tabulatore" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "Evidenziato 1" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "Guida evidenziata" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "Griglia" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "Guida 1" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "Guida 2" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "Guida 3" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "Bordo del pulsante 1" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "Sfondo del pulsante 1" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "Bordo del pulsante 2" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "Sfondo del pulsante 2" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "Bordo del pulsante 3" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "Sfondo del pulsante 3" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "Bordo del pulsante 4" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "Sfondo del pulsante 4" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "Primo piano del pulsante" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "Primo piano del pulsante selezionato" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "Primo piano dello strumento" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "Primo piano dello strumento selezionato" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "Sfondo dell'area di testo" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "Panoramica del bordo dell'elemento" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "Elemento della panoramica selezionato" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "Panoramica elemento 1" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "Panoramica dell'elemento 2" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "Panoramica del primo piano selezionato" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "Panoramica del primo piano" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "Sfondo del conteggio glifo 1" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "Sfondo del conteggio glifo 2" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "Ombra di dialogo" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "Punto di controllo cubico attivo selezionato" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "Punto di controllo cubico selezionato" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "Punto di controllo cubico attivo" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "Punto di controllo cubico" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "Punto di controllo quadratico attivo selezionato" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "Punto di controllo quadratico selezionato" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "Punto di controllo quadratico attivo" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "Punto di quadratico cubico" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "Maniglia del punto di controllo selezionata" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "Maniglia attiva" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "Maniglia del punto di controllo" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "Unisci" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "Pulsante in rilievo" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "Pulsante in rilievo attivo" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "Bordo della barra d'ingrandimento" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "Nome del carattere" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "Nuovo tema" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "Aggiungi nuovo tema" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "Colori" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "Scuro" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "Luminoso" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "Personalizzata" @@ -1730,7 +1747,7 @@ msgstr "Personalizzata" msgid "Color" msgstr "Colore" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "Maiusc" @@ -1742,7 +1759,7 @@ msgstr "Disegno a mano libera" msgid "New version" msgstr "Nuova versione" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "I tuoi caratteri sono stati esportati." @@ -1774,12 +1791,8 @@ msgstr "Formato non riconosciuto." msgid "Writing" msgstr "In Scrittura" -# May be better to use vista or schermata-#~ msgid "No glyphs in this view."-#~ msgstr "Nessun glifo in questa vista."--#~ msgid "Import"-#~ msgstr "Importa"+#~ msgid "color"+#~ msgstr "colore"  #~ msgid "Full name (name and style)" #~ msgstr "Nome completo (nome e stile)"@@ -2167,9 +2180,6 @@ msgstr "In Scrittura" #~ msgid "Update name & description" #~ msgstr "Atualizar nome e descrição" -#~ msgid "Create a new font"-#~ msgstr "Criar uma nova fonte"- #~ msgid "Add name and description to this font." #~ msgstr "Adicionar nome e descrição para esta fonte." diff --git a/po/nb.po b/po/nb.poindex 5ddf5b7..3d36e87 100644--- a/po/nb.po+++ b/po/nb.po@@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-09-08 19:57+0000\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2017-04-24 06:03+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: nb\n"@@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1441742272.000000\n"+"X-POOTLE-MTIME: 1493013811.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"@@ -63,7 +63,7 @@ msgstr "aktiver Macintosh-tilpasninger" #: libbirdfont/Argument.vala:288 #, fuzzy msgid "enable Windows customizations"-msgstr "slå på Windows tilpasninger"+msgstr "slå på WiSlÃ¥ pÃ¥SlÃ¥ pÃ¥ndows-tilpasninger"  #: libbirdfont/Argument.vala:289 msgid "don't translate"@@ -85,11 +85,16 @@ msgstr "Velg bakgrunn" msgid "Background Image" msgstr "Bakgrunnsbilde" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Flytt, skaler og roter bakgrunnsbildet" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr ""++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Velg bakgrunnsbilde" @@ -98,7 +103,7 @@ msgid "Images" msgstr "Bilder"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Filer" @@ -106,16 +111,16 @@ msgstr "Filer" msgid "Parts" msgstr "Deler" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Legg til" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "Velg type" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Åpne"@@ -133,10 +138,6 @@ msgstr "line" msgid "corner" msgstr "hjørne" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr ""- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "Sirkel"@@ -192,18 +193,18 @@ msgid "Thai" msgstr ""  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "a b c d e f g h i j k l m n o p q r s t u v w x y z æ ø å"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å"  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 #, fuzzy msgid "Name and Description" msgstr "Navn og _Beskrivelse"@@ -214,7 +215,7 @@ msgid "PostScript Name" msgstr "Postskript-navn"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Navn" @@ -244,9 +245,9 @@ msgstr "Fullt navn (navn og stil)" msgid "Unique Identifier" msgstr "Unik identifikator" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Versjon" @@ -260,11 +261,11 @@ msgstr "Opphavsrett"  #: libbirdfont/DescriptionDisplay.vala:183 msgid "License"-msgstr ""+msgstr "linsenslinsenslinsenslinsenslinsensLisens"  #: libbirdfont/DescriptionDisplay.vala:195 msgid "License URL"-msgstr ""+msgstr "Nettadresse til lisens"  #: libbirdfont/DescriptionDisplay.vala:207 msgid "Trademark"@@ -308,7 +309,7 @@ msgstr ""  #: libbirdfont/DrawingTools.vala:126 libbirdfont/Menu.vala:247 msgid "Layers"-msgstr ""+msgstr "Lag"  #: libbirdfont/DrawingTools.vala:127 msgid "Stroke"@@ -318,7 +319,7 @@ msgstr "" msgid "Geometrical Shapes" msgstr "" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 #, fuzzy msgid "Zoom" msgstr "_Zoom"@@ -331,17 +332,21 @@ msgstr "" msgid "Grid Size" msgstr "" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas"+msgstr "Flytt lerret"++#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204 msgid "Delete"-msgstr ""+msgstr "Slett"  #: libbirdfont/DrawingTools.vala:211 msgid "Select all points or paths"@@ -350,239 +355,232 @@ msgstr "" #: libbirdfont/DrawingTools.vala:227 libbirdfont/Menu.vala:99 #, fuzzy msgid "Undo"-msgstr "_Angre"+msgstr "Angre"  #: libbirdfont/DrawingTools.vala:234 msgid "Insert new points on path" msgstr "" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Konverter markerte punkter" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width"-msgstr ""+msgstr "Bredde" -#: libbirdfont/DrawingTools.vala:435-#, fuzzy+#: libbirdfont/DrawingTools.vala:432 msgid "Height"-msgstr "Vekt"+msgstr "Høyde" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Bind sammen kurvehåndtak for det valgte endrepunktet" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "" -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Lag en en innvendig fra omriss" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 #, fuzzy msgid "Close path" msgstr "Lukk _Filsti" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 #, fuzzy msgid "Move to path to the bottom of the layer" msgstr "Flytt linjeformen til det nederste laget" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "Angi størrelse for bakgrunnsbilde" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "Vis/skjul bakgrunnsbilde" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Sett inn ett nytt bakgrunnsbilde" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "" -#: libbirdfont/DrawingTools.vala:765-#, fuzzy+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image"-msgstr "Velg bakgrunnsbilde"+msgstr "Slett bakgrunnsbilde" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer"-msgstr ""+msgstr "Legg til lag" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers"-msgstr ""+msgstr "Vis lag" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Kantlinje bredde" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Vis rettningslinjer" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 #, fuzzy msgid "Show more guidelines" msgstr "Vis rettningslinjer" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "Vis hjelpelinjer på topp- og bunnmarginen" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "Vis hele tegnet" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 #, fuzzy msgid "Zoom in on background image" msgstr "Zoom inn bakgrunnsbildet" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "Forrige visning" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Neste visning" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Angi størrelse for rutenett"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings"-msgstr ""+msgstr "Ekspertinnstillinger"  #: libbirdfont/ExportSettings.vala:45 libbirdfont/ExportSettings.vala:60 msgid "File Name"-msgstr ""+msgstr "Filnavn"  #: libbirdfont/ExportSettings.vala:75 msgid "Units Per Em" msgstr "" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder"-msgstr ""+msgstr "Mappe"  #: libbirdfont/ExportSettings.vala:98 msgid "Formats"-msgstr ""+msgstr "Alfabet" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "Eksporter" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Lagre" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "" @@ -617,11 +615,11 @@ msgstr "Finner ikke mappen"  #: libbirdfont/FileDialogTab.vala:79 msgid "Select a Folder"-msgstr ""+msgstr "Velg ei mappe"  #: libbirdfont/FileDialogTab.vala:83 msgid "Folders"-msgstr ""+msgstr "Mapper"  #: libbirdfont/FileTools.vala:31 msgid "New font"@@ -629,56 +627,56 @@ msgstr "Ny skrifttype"  #: libbirdfont/FileTools.vala:37 msgid "Open font"-msgstr ""+msgstr "Åpne skrifttype"  #: libbirdfont/FileTools.vala:43 msgid "Save font"-msgstr ""+msgstr "Lagre skrifttype" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings"-msgstr ""+msgstr "Innstillinger"  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes"-msgstr ""+msgstr "Drakter" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left"-msgstr ""+msgstr "venstre" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right"-msgstr ""+msgstr "høyre" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "" @@ -690,10 +688,6 @@ msgstr "Vis rutenett" msgid "Guides" msgstr "" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr "Zoom inn"@@ -722,50 +716,44 @@ msgstr "BF-FIL" msgid "SVG-FILES ..." msgstr "SVG-FILER ..." -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "eksisterer ikke" -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "Ny font skal opprettes." -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "Mislykket å importere" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "Avbryter" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "er ikke navnet på tegn eller Unicode-verdi" -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "Unicode-verdier må begynne med U+" -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "Legger til" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "for" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "Tegn" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Kniping (tegnavstand)" @@ -781,16 +769,16 @@ msgstr "" msgid "Type “space” to kern the space character and “divis” to kern -." msgstr "" -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Lukk" @@ -802,16 +790,16 @@ msgstr "" msgid "No kerning pairs created." msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "" @@ -823,51 +811,56 @@ msgstr "" msgid "Kerning Tools" msgstr "" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size"-msgstr ""+msgstr "Skriftstørrelse" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "" -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "" -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "" -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "" -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions" msgstr "" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 #, fuzzy msgid "Character Sets" msgstr "Tegnsett"@@ -877,13 +870,9 @@ msgstr "Tegnsett" msgid "Character Set" msgstr "Tegnsett" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer"-msgstr ""+msgstr "Lag"  #: libbirdfont/LigatureList.vala:53 msgid "character sequence"@@ -922,23 +911,23 @@ msgid "Contextual Substitutions" msgstr ""  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "" @@ -967,58 +956,49 @@ msgstr "" msgid "You need an older version of Birdfont to open it." msgstr "" -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Tegnsekvens"  #: libbirdfont/Menu.vala:37-#, fuzzy msgid "File"-msgstr "Filer"+msgstr "Fil"  #: libbirdfont/Menu.vala:43-#, fuzzy msgid "New"-msgstr "_Ny"+msgstr "Ny" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81-#, fuzzy+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files"-msgstr "_Sist åpnede filer"+msgstr "Sist åpnede filer"  #: libbirdfont/Menu.vala:71-#, fuzzy msgid "Save As"-msgstr "Lagre _som"+msgstr "Lagre som"  #: libbirdfont/Menu.vala:78-#, fuzzy msgid "Select Character Set"-msgstr "Velg _Tegnsett"+msgstr "Velg tegnsett"  #: libbirdfont/Menu.vala:85-#, fuzzy msgid "Quit"-msgstr "_Avslutt"+msgstr "Avslutt"  #: libbirdfont/Menu.vala:93-#, fuzzy msgid "Edit"-msgstr "_Endre"+msgstr "Endre"  #: libbirdfont/Menu.vala:106 msgid "Redo"-msgstr ""+msgstr "Gjenta"  #: libbirdfont/Menu.vala:113-#, fuzzy msgid "Copy"-msgstr "_Kopier"+msgstr "Kopier"  #: libbirdfont/Menu.vala:120-#, fuzzy msgid "Paste"-msgstr "_Lim inn"+msgstr "Lim inn"  #: libbirdfont/Menu.vala:127 msgid "Paste In Place"@@ -1038,8 +1018,8 @@ msgstr "Velg Alle St_ier" msgid "Move To Baseline" msgstr "" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "" @@ -1114,131 +1094,116 @@ msgid "Export Fonts" msgstr ""  #: libbirdfont/Menu.vala:281-#, fuzzy msgid "Export Glyph as SVG"-msgstr "_Eksportér tegn som SVG"+msgstr "Eksporter tegn som SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file"-msgstr ""+msgstr "Importer SVG-fil" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder"-msgstr ""--#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""+msgstr "Importer SVG-mappe" -#: libbirdfont/Menu.vala:322-#, fuzzy+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "Velg Bakgrunnsbilde" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "Forhåndsvis" -#: libbirdfont/Menu.vala:344-#, fuzzy+#: libbirdfont/Menu.vala:324 msgid "Tab"-msgstr "_Fane"+msgstr "Fane" -#: libbirdfont/Menu.vala:350-#, fuzzy+#: libbirdfont/Menu.vala:330 msgid "Next Tab"-msgstr "_Neste fane"+msgstr "Neste fane" -#: libbirdfont/Menu.vala:357-#, fuzzy+#: libbirdfont/Menu.vala:337 msgid "Previous Tab"-msgstr "_Forrige fane"+msgstr "Forrige fane" -#: libbirdfont/Menu.vala:364-#, fuzzy+#: libbirdfont/Menu.vala:344 msgid "Close Tab"-msgstr "_Lukk fane"+msgstr "Lukk fane" -#: libbirdfont/Menu.vala:371-#, fuzzy+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs"-msgstr "Lukk _alle faner"+msgstr "Lukk alle faner" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git"-msgstr ""+msgstr "Git" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp"-msgstr ""+msgstr "Lagre som .bfp" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Oversikt" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP"-msgstr ""+msgstr "OPP"  #: libbirdfont/MenuItem.vala:85 msgid "DOWN"-msgstr ""+msgstr "NED"  #: libbirdfont/MenuItem.vala:88 msgid "LEFT"-msgstr ""+msgstr "VENSTRE"  #: libbirdfont/MenuItem.vala:91 msgid "RIGHT"-msgstr ""+msgstr "HØYRE"  #: libbirdfont/MenuTab.vala:95 msgid "Missing metadata in font:"@@ -1257,7 +1222,12 @@ msgstr "" msgid "Menu" msgstr "Meny" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+#, fuzzy+msgid "Can't create TTF font."+msgstr "Lag en ny skrifttype"++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "" @@ -1265,27 +1235,31 @@ msgstr "" msgid "Move paths" msgstr "Flytt linjeformer" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "" @@ -1305,17 +1279,21 @@ msgstr "" msgid "Swashes" msgstr "" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr "Ingen tegn i dette bildet"++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "Se også:"  #: libbirdfont/OverWriteDialogListener.vala:30 msgid "Overwrite TTF file?"-msgstr "Overskrive TTF-filen?"+msgstr "Overskriv TTF-fila?"  #: libbirdfont/OverWriteDialogListener.vala:31 msgid "Overwrite"@@ -1330,43 +1308,44 @@ msgstr "Avbryt" msgid "Yes, don't ask again." msgstr "Ja, ikke spør igjen." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default"-msgstr ""+msgstr "Forvalg" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "" @@ -1382,7 +1361,7 @@ msgstr "" msgid "Add new points" msgstr "" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "" @@ -1398,26 +1377,26 @@ msgstr "" msgid "Generate html document" msgstr "" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 #, fuzzy msgid "Glyphs" msgstr "Tegn" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 msgid "Backups"-msgstr ""+msgstr "Sikkerhetskopier"  #: libbirdfont/RectangleTool.vala:30 msgid "Rectangle"-msgstr ""+msgstr "Rektangel"  #: libbirdfont/ResizeTool.vala:49 msgid "Resize and rotate paths"@@ -1425,7 +1404,7 @@ msgstr ""  #: libbirdfont/SaveDialog.vala:36 msgid "Save changes?"-msgstr ""+msgstr "Lagre endringer?"  #: libbirdfont/SaveDialog.vala:44 libbirdfont/SaveDialogListener.vala:30 msgid "Discard"@@ -1435,43 +1414,48 @@ msgstr "Avbryt og slett" msgid "Save?" msgstr "Lagre?" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "" -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "" -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "Ikke oversett"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "" @@ -1483,289 +1467,293 @@ msgstr "" msgid "Left" msgstr "" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "Importer"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 #, fuzzy msgid "Stroke Color" msgstr "Kantlinje farge" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 #, fuzzy msgid "Handle Color" msgstr "Håndtakfarge" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "" @@ -1773,7 +1761,7 @@ msgstr "" msgid "Color" msgstr "" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "" @@ -1785,7 +1773,7 @@ msgstr "" msgid "New version" msgstr "Ny versjon" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "" @@ -1818,12 +1806,6 @@ msgstr "" msgid "Writing" msgstr "Skriver" -#~ msgid "No glyphs in this view."-#~ msgstr "Ingen tegn i dette bildet"--#~ msgid "Import"-#~ msgstr "Importer"- #, fuzzy #~ msgid "Full name (name and style)" #~ msgstr "Fullt navn (navn og stil)"@@ -2108,9 +2090,6 @@ msgstr "Skriver" #~ msgid "Update name & description" #~ msgstr "Oppdater navn og beskrivelse" -#~ msgid "Create a new font"-#~ msgstr "Lag en ny skrifttype"- #~ msgid "Preferences" #~ msgstr "Innstillinger" diff --git a/po/nl.po b/po/nl.poindex 2022ca5..2e269be 100644--- a/po/nl.po+++ b/po/nl.po@@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-12-27 03:31+0000\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2016-10-09 08:16+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: nl\n"@@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1451187107.000000\n"+"X-POOTLE-MTIME: 1476001011.000000\n"  # Please, fix the capitalization errors #: libbirdfont/Argument.vala:277@@ -85,11 +85,16 @@ msgstr "Achtergrond selecteren" msgid "Background Image" msgstr "Achtergrondafbeelding" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Achtergrondafbeelding verplaatsen, vergroten/verkleinen en draaien" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr "op as"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Achtergrondafbeelding selecteren" @@ -98,7 +103,7 @@ msgid "Images" msgstr "Afbeeldingen"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Bestanden" @@ -106,16 +111,16 @@ msgstr "Bestanden" msgid "Parts" msgstr "Delen" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Toevoegen" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "Symbool selecteren" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Openen"@@ -132,10 +137,6 @@ msgstr "lijn" msgid "corner" msgstr "hoek" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr "op as"- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "Cirkel"@@ -189,18 +190,18 @@ msgid "Thai" msgstr "Thais"  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "a b c d e f g h i j k l m n o p q r s t u v w x y z"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description" msgstr "Naam en beschrijving" @@ -209,7 +210,7 @@ msgid "PostScript Name" msgstr "PostScript-naam"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Naam" @@ -237,9 +238,9 @@ msgstr "Volledige naam (naam en stijl)" msgid "Unique Identifier" msgstr "Unieke id" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Versie" @@ -311,7 +312,7 @@ msgstr "Streek" msgid "Geometrical Shapes" msgstr "Geometrische vormen" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "Zoomen" @@ -323,12 +324,16 @@ msgstr "Richtlijnen & raster" msgid "Grid Size" msgstr "Rastergrootte" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "Papier verplaatsen" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -347,197 +352,192 @@ msgstr "Ongedaan maken" msgid "Insert new points on path" msgstr "Nieuwe punten op pad invoegen" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "Kwadratische Bézier-curven maken" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "Kubieke Bézier-curven maken" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "Kwadratisch pad met twee lijngrepen" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Geselecteerde punten converteren" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "X-coördinaat" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "Y-coördinaat" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "Draaiing" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "Breedte" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "Hoogte" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Gebogen grepen voor het geselecteerde bewerkingspunt binden" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "Symmetrische grepen" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Segment converteren naar lijn" -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Tegenstelling van omlijning maken" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "Object schalen naar bovenkant/basislijn" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path" msgstr "Pad sluiten" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 msgid "Move to path to the bottom of the layer" msgstr "Verplaatsen naar pad aan onderkant van de laag" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Pad verticaal spiegelen" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Pad horizontaal spiegelen" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "Grootte voor achtergrondafbeelding instellen" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "Achtergrondafbeelding tonen/verbergen" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Nieuwe achtergrondafbeelding invoegen" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "Hoog contrast" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "Achtergronddrempel instellen" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "Hoeveelheid autotrace-details" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "Autotrace-vereenvoudiging" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "Autotrace-achtergrondafbeelding" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "Achtergrondafbeelding verwijderen" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "Laag toevoegen" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "Lagen tonen" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "Streek toepassen" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Lijndikte" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "Overzichtsstreek maken" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "Stomp lijneinde" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "Rond lijneinde" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "Recht lijneinde" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Hulplijnen tonen" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines" msgstr "Meer hulplijnen tonen" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "Hulplijnen bij boven- en ondermarge tonen" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "Hulplijnen en raster vergrendelen" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "Meer uitzoomen" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "Volledig symbool tonen" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "Passend in weergave" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "Inzoomen op achtergrondafbeelding" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "Vorige weergave" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Volgende weergave" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Grootte voor raster instellen"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "Instellingen exporteren" @@ -549,7 +549,7 @@ msgstr "Bestandsnaam" msgid "Units Per Em" msgstr "Eenheden per Em" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "Map" @@ -557,17 +557,17 @@ msgstr "Map" msgid "Formats" msgstr "Indelingen" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "Exporteren" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Opslaan" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "Alfabet" @@ -616,50 +616,50 @@ msgstr "Lettertype openen" msgid "Save font" msgstr "Lettertype opslaan" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr "Instellingen"  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "Thema's" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "bovenmarge" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "boven" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "x-hoogte" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "basislijn" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "onder" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "ondermarge" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left" msgstr "links" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right" msgstr "rechts" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "Hulplijn" @@ -671,10 +671,6 @@ msgstr "Raster tonen" msgid "Guides" msgstr "Hulplijnen" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr "Inzoomen"@@ -703,50 +699,44 @@ msgstr "BF-BESTAND" msgid "SVG-FILES ..." msgstr "SVG-BESTANDEN ..." -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "bestaat niet." -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "Er wordt een nieuw lettertype gemaakt." -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "Importeren mislukt" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "Afbreken" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "is geen naam van een symbool of een Unicode-waarde." -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "Unicode-waarden moeten met U+ beginnen." -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "Voegt toe:" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "aan" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "Symbool" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Afspatiëring" @@ -763,16 +753,16 @@ msgstr "" msgid "Type “space” to kern the space character and “divis” to kern -." msgstr "Typ ‘spatie’ voor afspatiëren van het spatieteken en ‘divis’ voor -." -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "Unicode" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "Invoegen" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Sluiten" @@ -784,16 +774,16 @@ msgstr "Afspatiëringscombinaties" msgid "No kerning pairs created." msgstr "Geen afspatiëringscombinaties gemaakt." -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "Afspatiëringsklasse" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Instellen" @@ -805,51 +795,56 @@ msgstr "Afspatiëringsstrings laden" msgid "Kerning Tools" msgstr "Afspatiëringshulpmiddelen" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "Lettergrootte" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "Nieuwe afspatiëringsklasse maken" -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "Gebruik tekstinvoer om afspatiëringswaarden in te voeren." -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "Symbool van overzicht toevoegen" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "Teken invoegen op Unicode-waarde" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "Open eerst een tekstbestand met afspatiëringsstrings." -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "Vorige afspatiëringsstring" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "U hebt het begin van de lijst bereikt." -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "Volgende afspatiëringsstring" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "U hebt het einde van de lijst bereikt." -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions" msgstr "Vervangingen" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "Tekensets" @@ -857,11 +852,7 @@ msgstr "Tekensets" msgid "Character Set" msgstr "Tekenset" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer" msgstr "Laag" @@ -902,23 +893,23 @@ msgid "Contextual Substitutions" msgstr "Contextuele vervangingen"  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "Ligaturen" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "Begin" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "Midden" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "Einde" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "Ligatuur" @@ -946,7 +937,7 @@ msgstr "Dit lettertype is met een oude versie van Birdfont gemaakt." msgid "You need an older version of Birdfont to open it." msgstr "U hebt een oudere versie van Birdfont nodig om het te openen." -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Symboolvolgorde" @@ -958,7 +949,7 @@ msgstr "Bestand" msgid "New" msgstr "Nieuw" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files" msgstr "Recente bestanden" @@ -1006,8 +997,8 @@ msgstr "Alle symbolen selecteren" msgid "Move To Baseline" msgstr "Verplaatsen naar basislijn" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "Zoeken" @@ -1079,106 +1070,98 @@ msgstr "Lettertypen exporteren" msgid "Export Glyph as SVG" msgstr "Symbool exporteren als SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "SVG-bestand importeren" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "SVG-map importeren" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr "kleur"--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "Achtergrondafbeelding importeren" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "Voorbeeld" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 msgid "Tab" msgstr "Tabblad" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 msgid "Next Tab" msgstr "Volgende tabblad" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 msgid "Previous Tab" msgstr "Vorige tabblad" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 msgid "Close Tab" msgstr "Tabblad sluiten" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs" msgstr "Alle tabbladen sluiten" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "Spatiëring en afspatiëring" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "Spatiëringstabblad tonen" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "Afspatiëringstabblad tonen" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "Afspatiëringscombinaties tonen" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "Spatiëringsklassen" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "Volgende afspatiëringscombinatie selecteren" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "Vorige afspatiëringscombinatie selecteren" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "Afspatiëringsstrings laden" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "Afspatiëringsstrings opnieuw laden" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "Ligaturen tonen" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "Ligatuur toevoegen" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "Git" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "Opslaan als .bfp" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Overzicht" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr "OMHOOG"@@ -1213,7 +1196,11 @@ msgstr "U dient uw lettertype op te slaan voor het exporteren." msgid "Menu" msgstr "Menu" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+msgid "Can't create TTF font."+msgstr ""++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "Ligatuur toevoegen" @@ -1221,27 +1208,31 @@ msgstr "Ligatuur toevoegen" msgid "Move paths" msgstr "Paden verplaatsen" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "Symboolvervangingen" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "Nieuw symbool" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "Vervanging" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "Label" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "Symboolnaam" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "Alle symbolen moeten unieke namen hebben." @@ -1261,11 +1252,15 @@ msgstr "Hoofdletters naar kleine hoofdletters" msgid "Swashes" msgstr "Swashes" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "Filteren" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr "Geen symbolen in deze weergave."++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "Zie ook:" @@ -1286,44 +1281,44 @@ msgstr "Annuleren" msgid "Yes, don't ask again." msgstr "Ja, niet meer vragen." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "Transformeren" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "Multi-Master" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "Alle symbolen" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "Standaard" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "Hellen" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "Grootte wijzigen" -#: libbirdfont/OverviewTools.vala:134-#, fuzzy+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "Alternatief maken" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "Curveoriëntatie instellen" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "Mastergrootte" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "Nieuw masterlettertype maken" @@ -1339,7 +1334,7 @@ msgstr "Vervangen" msgid "Add new points" msgstr "Nieuwe punten toevoegen" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "Controlepunten verplaatsen" @@ -1355,19 +1350,19 @@ msgstr "Lettertypen exporteren" msgid "Generate html document" msgstr "Html-document genereren" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "Nog geen lettertypen gemaakt" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "Nieuw lettertype maken" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 msgid "Glyphs" msgstr "Symbolen" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 msgid "Backups" msgstr "Back-ups" @@ -1391,43 +1386,48 @@ msgstr "Verwerpen" msgid "Save?" msgstr "Opslaan?" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "Precisie voor penhulpmiddel" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "Controlepuntgrepen tonen of verbergen" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "Vul open paden." -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "Gebruik TTF-eenheden." -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "Aantal toegevoegde punten door het vrijestijl-hulpmiddel" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "Padvereenvoudigingsdrempel" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "niet vertalen"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "Kleurthema" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "Sneltoetsen" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "Teken" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "Nieuwe spatiëringsklasse" @@ -1439,287 +1439,291 @@ msgstr "Spatiëring" msgid "Left" msgstr "Links" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "Rechts" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "Importeren"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "Papierachtergrond" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "Opgevulde streek" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "Streekkleur" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "Kleur van greep" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "Opvulkleur" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "Geselecteerde objecten" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "Achtergrond 1" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "Dialoogachtergrond" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "Menuachtergrond" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "Standaardachtergrond" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "Selectievakachtergrond" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "Voorgrond 1" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "Tekstvoorgrond" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "Tabelrand" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "Selectierand" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "Overzichtssymbool" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "Voorgrond omgekeerd" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "Menuvoorgrond" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "Voorgrond van geselecteerd tabblad" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "Tabbladscheiding" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "Geaccentueerd 1" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "Geaccentueerde hulplijn" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "Raster" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "Hulplijn 1" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "Hulplijn 2" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "Hulplijn 3" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "Knoprand 1" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "Knopachtergrond 1" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "Knoprand 2" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "Knopachtergrond 2" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "Knoprand 3" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "Knopachtergrond 3" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "Knoprand 4" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "Knopachtergrond 4" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "Knopvoorgrond" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "Voorgrond van geselecteerde knop" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "Voorgrond van hulpmiddel" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "Voorgrond van geselecteerd hulpmiddel" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "Achtergrond van tekstgebied" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "Rand van overzichtsitem" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "Geselecteerd overzichtsitem" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "Overzichtsitem 1" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "Overzichtsitem 2" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "Voorgrond van geselecteerd overzicht" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "Voorgrond van overzicht" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "Achtergrond van symboolteller 1" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "Achtergrond van symboolteller 2" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "Dialoogschaduw" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "Geselecteerd actief kubiek controlepunt" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "Geselecteerd kubiek controlepunt" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "Actief kubiek controlepunt" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "Kubiek controlepunt" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "Geselecteerd actief kwadratisch controlepunt" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "Geselecteerd kwadratisch controlepunt" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "Actief kwadratisch controlepunt" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "Kubiek kwadratisch punt" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "Geselecteerde controlepuntgreep" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "Actieve greep" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "Controlepuntgreep" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "Samenvoegen" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "Draaiknop" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "Actieve draaiknop" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "Rand van zoombalk" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "Lettertypenaam" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "Nieuw thema" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "Nieuw thema toevoegen" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "Kleuren" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "Donker" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "Helder" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "Aangepast" @@ -1727,7 +1731,7 @@ msgstr "Aangepast" msgid "Color" msgstr "Kleur" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "Shift" @@ -1739,7 +1743,7 @@ msgstr "Tekenen uit de vrije hand" msgid "New version" msgstr "Nieuwe versie" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "Uw lettertypen zijn geëxporteerd." @@ -1771,11 +1775,8 @@ msgstr "Onbekende bestandsindeling." msgid "Writing" msgstr "Schrijven" -#~ msgid "No glyphs in this view."-#~ msgstr "Geen symbolen in deze weergave."--#~ msgid "Import"-#~ msgstr "Importeren"+#~ msgid "color"+#~ msgstr "kleur"  #~ msgid "Full name (name and style)" #~ msgstr "Volledige naam (naam en stijl)"diff --git a/po/oc.po b/po/oc.poindex 280d7bf..faa0abf 100644--- a/po/oc.po+++ b/po/oc.po@@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-03-26 20:40+0000\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2016-07-12 07:53+0000\n" "Last-Translator: Cédric <cvalmary@yahoo.fr>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: oc\n"@@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1427402406.000000\n"+"X-POOTLE-MTIME: 1468310039.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"@@ -70,7 +70,7 @@ msgstr "tradusir pas"  #: libbirdfont/Argument.vala:290 msgid "sleep between each command in test suite"-msgstr "introdusir de pausas entre cada comanda del tèst"+msgstr "introduire de pausas entre cada comanda del tèst"  #: libbirdfont/Argument.vala:291 msgid "run test case"@@ -78,26 +78,31 @@ msgstr "aviar lo tèst de casa"  #: libbirdfont/BackgroundSelectionTool.vala:23 msgid "Select background"-msgstr "Seleccionar lo rèire plan"+msgstr "Seleccionar lo rèireplan"  #: libbirdfont/BackgroundTab.vala:47 libbirdfont/BackgroundTools.vala:26 msgid "Background Image"-msgstr "Imatge de rèire plan"+msgstr "Imatge de rèireplan" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Desplaçar, redimensionar e virar l'imatge de fons." -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr "sus l’axe"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image"-msgstr ""+msgstr "Seleccionar un imatge de rèireplan"  #: libbirdfont/BackgroundTools.vala:27 msgid "Images" msgstr "Imatges"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Fichièrs" @@ -105,35 +110,31 @@ msgstr "Fichièrs" msgid "Parts" msgstr "Partidas" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Apondre" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph"-msgstr ""+msgstr "Seleccionar un glif" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Dobrir"  #: libbirdfont/BezierTool.vala:91 msgid "Create Beziér curves"-msgstr ""+msgstr "Crear una corba de Bézier"  #: libbirdfont/BezierTool.vala:95 msgid "line"-msgstr ""+msgstr "linha"  #: libbirdfont/BezierTool.vala:99 msgid "corner"-msgstr ""--#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr ""+msgstr "caire"  #: libbirdfont/CircleTool.vala:36 msgid "Circle"@@ -141,15 +142,13 @@ msgstr "Cercle"  #: libbirdfont/CutBackgroundTool.vala:38 msgid "Crop background image"-msgstr "Rosegar l'imatge de rèire plan."+msgstr "Retalhar l'imatge de rèireplan."  #: libbirdfont/DefaultCharactersSet.vala:25-#, fuzzy msgid "Default Language" msgstr "Lenga per defaut"  #: libbirdfont/DefaultCharactersSet.vala:26-#, fuzzy msgid "Private Use Area" msgstr "Zòna d'usatge privat" @@ -175,7 +174,7 @@ msgstr "Javanés"  #: libbirdfont/DefaultCharactersSet.vala:33 msgid "Latin"-msgstr ""+msgstr "Latin"  #: libbirdfont/DefaultCharactersSet.vala:34 msgid "Russian"@@ -187,31 +186,30 @@ msgstr "Suedés"  #: libbirdfont/DefaultCharactersSet.vala:36 msgid "Thai"-msgstr ""+msgstr "Tai"  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "a b c d e f g h i j k l m n o p q r s t u v w x y z"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203-#, fuzzy+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description"-msgstr "Nom e _Descripcion"+msgstr "Nom e descripcion"  #: libbirdfont/DescriptionDisplay.vala:70 libbirdfont/MenuTab.vala:98 msgid "PostScript Name" msgstr "Nom de PostScript"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Nom" @@ -232,18 +230,16 @@ msgid "Weight" msgstr "Grais"  #: libbirdfont/DescriptionDisplay.vala:129 libbirdfont/MenuTab.vala:113-#, fuzzy msgid "Full Name (Name and Style)" msgstr "Nom complet (nom e estil)"  #: libbirdfont/DescriptionDisplay.vala:140 libbirdfont/MenuTab.vala:118-#, fuzzy msgid "Unique Identifier" msgstr "Identificant unic" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Version" @@ -253,331 +249,326 @@ msgstr "Descripcion"  #: libbirdfont/DescriptionDisplay.vala:171 msgid "Copyright"-msgstr "Dreches d'autor"+msgstr "Dreits d'autor"  #: libbirdfont/DescriptionDisplay.vala:183 msgid "License"-msgstr ""+msgstr "Licéncia"  #: libbirdfont/DescriptionDisplay.vala:195 msgid "License URL"-msgstr ""+msgstr "Adreça de la licéncia"  #: libbirdfont/DescriptionDisplay.vala:207 msgid "Trademark"-msgstr ""+msgstr "Marca depausada"  #: libbirdfont/DescriptionDisplay.vala:219 msgid "Manufacturer"-msgstr ""+msgstr "Fabricant"  #: libbirdfont/DescriptionDisplay.vala:230 msgid "Designer"-msgstr ""+msgstr "Grafista"  #: libbirdfont/DescriptionDisplay.vala:241 msgid "Vendor URL"-msgstr ""+msgstr "URL del fabricant"  #: libbirdfont/DescriptionDisplay.vala:252 msgid "Designer URL"-msgstr ""+msgstr "Site del grafista"  #: libbirdfont/DrawingTools.vala:112 msgid "Background Tools"-msgstr ""+msgstr "Aisinas de rèireplan"  #: libbirdfont/DrawingTools.vala:113 msgid "Control Points"-msgstr ""+msgstr "Punts de contraròtle"  #: libbirdfont/DrawingTools.vala:114 msgid "Object Tools"-msgstr ""+msgstr "Aisinas de l'objècte"  #: libbirdfont/DrawingTools.vala:123 msgid "Drawing Tools"-msgstr ""+msgstr "Aisinas de dessenh"  #: libbirdfont/DrawingTools.vala:124 msgid "Control Point"-msgstr ""+msgstr "Punt de contraròtle"  #: libbirdfont/DrawingTools.vala:126 libbirdfont/Menu.vala:247 msgid "Layers"-msgstr ""+msgstr "Calques"  #: libbirdfont/DrawingTools.vala:127 msgid "Stroke"-msgstr ""+msgstr "Traçat"  #: libbirdfont/DrawingTools.vala:128 msgid "Geometrical Shapes"-msgstr ""+msgstr "Formas geometricas" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40-#, fuzzy+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom"-msgstr "_Zoom"+msgstr "Zoom"  #: libbirdfont/DrawingTools.vala:130 msgid "Guidelines & Grid"-msgstr ""+msgstr "Linhas guida e grasilhas"  #: libbirdfont/DrawingTools.vala:135 msgid "Grid Size"-msgstr ""+msgstr "Talha de la grasilha" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas"+msgstr "Desplaçar lo canavàs"++#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204 msgid "Delete"-msgstr ""+msgstr "Suprimir"  #: libbirdfont/DrawingTools.vala:211 msgid "Select all points or paths" msgstr ""  #: libbirdfont/DrawingTools.vala:227 libbirdfont/Menu.vala:99-#, fuzzy msgid "Undo"-msgstr "_Anullar"+msgstr "Desfar"  #: libbirdfont/DrawingTools.vala:234 msgid "Insert new points on path" msgstr "" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "Crear de corbas de Bézier qüadraticas" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "Crear de corbas de Bézier cubicas" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "Camin qüadratic amb doas punhadas de contraròtle" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Convertir los punts seleccionats" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate"-msgstr ""+msgstr "Coordenada X" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate"-msgstr ""+msgstr "Coordenada X" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation"-msgstr ""+msgstr "Rotacion" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width"-msgstr ""+msgstr "Largor" -#: libbirdfont/DrawingTools.vala:435-#, fuzzy+#: libbirdfont/DrawingTools.vala:432 msgid "Height"-msgstr "Grais"+msgstr "Nautor" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Crear un punt de corba per la linha seleccionada." -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "Punhadas simetricas" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Convertir lo segment en linha." -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Crear un comptador dempuèi la linha exteriora" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path"-msgstr ""+msgstr "Tampar lo traçat" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 msgid "Move to path to the bottom of the layer"-msgstr ""+msgstr "Desplaçar lo traçat cap a la partida inferiora del calc" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Revirar verticalament lo camin" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Revirar orizontalament lo camin" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image"-msgstr "Definir la talha de l'imatge de rèire plan."+msgstr "Definir la talha de l'imatge de rèireplan." -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image"-msgstr "Afichar / amagar l'imatge de rèire plan."+msgstr "Afichar / amagar l'imatge de rèireplan." -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Inserir un novèl imatge de fons" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image"-msgstr ""+msgstr "Seleccionar un imatge de rèireplan" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer"-msgstr ""+msgstr "Apondre un calc" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers"-msgstr ""+msgstr "Afichar los calques" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke"-msgstr ""+msgstr "Aplicar lo trait" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width"-msgstr "Espessor de trach"+msgstr "Espessor de trait" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Afichar lo guida" -#: libbirdfont/DrawingTools.vala:1020-#, fuzzy+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines"-msgstr "Afichar lo guida"+msgstr "Afichar mai de linhas directrises" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "Afichar lo guida als marges d'amont e d'aval" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More"-msgstr ""+msgstr "Deszoomar encara" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "Afichar lo glyph complet" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image"-msgstr "Zoom sus l'imatge de rèire plan"+msgstr "Zoom sus l'imatge de rèireplan" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "Visualizacion precedenta" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Visualizacion seguenta" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Definir las dimensions de la grasilha."  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr ""  #: libbirdfont/ExportSettings.vala:45 libbirdfont/ExportSettings.vala:60 msgid "File Name"-msgstr ""+msgstr "Nom del fichièr"  #: libbirdfont/ExportSettings.vala:75 msgid "Units Per Em" msgstr "" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder"-msgstr ""+msgstr "Dorsièr"  #: libbirdfont/ExportSettings.vala:98 msgid "Formats"-msgstr ""+msgstr "Formats" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "Exportar" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Enregistrar" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet"-msgstr ""+msgstr "Alfabet"  #: libbirdfont/ExportUtils.vala:17 libbirdfont/ImportUtils.vala:17 #: birdfont-autotrace/AutoTrace.vala:66@@ -590,15 +581,15 @@ msgstr "Imprimir lo messatge"  #: libbirdfont/ExportUtils.vala:21 msgid "write files to this directory"-msgstr ""+msgstr "enregistrar los fichièrs dins aqueste dorsièr"  #: libbirdfont/ExportUtils.vala:22 msgid "write svg file"-msgstr ""+msgstr "enregistrar al format SVG"  #: libbirdfont/ExportUtils.vala:23 msgid "write ttf and eot file"-msgstr ""+msgstr "enregistrar al format ttf e eot"  #: libbirdfont/ExportUtils.vala:130 msgid "Can't find output directory"@@ -606,68 +597,68 @@ msgstr "Impossible de trobar lo dorsièr de sortida"  #: libbirdfont/FileDialogTab.vala:79 msgid "Select a Folder"-msgstr ""+msgstr "Seleccionatz un dorsièr"  #: libbirdfont/FileDialogTab.vala:83 msgid "Folders"-msgstr ""+msgstr "Dorsièrs"  #: libbirdfont/FileTools.vala:31 msgid "New font"-msgstr ""+msgstr "Poliça novèla"  #: libbirdfont/FileTools.vala:37 msgid "Open font"-msgstr ""+msgstr "Dobrir una poliça"  #: libbirdfont/FileTools.vala:43 msgid "Save font"-msgstr ""+msgstr "Enregistrar la poliça" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings"-msgstr ""+msgstr "Paramètres"  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin"-msgstr ""+msgstr "marge inferior" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left"-msgstr ""+msgstr "esquèrra" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right"-msgstr ""+msgstr "dreita" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "" @@ -679,10 +670,6 @@ msgstr "Afichar la grasilha" msgid "Guides" msgstr "" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr "Zoom avant"@@ -711,50 +698,44 @@ msgstr "" msgid "SVG-FILES ..." msgstr "" -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "" -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "" -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "" -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "" -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding"-msgstr ""+msgstr "Apondon" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to"-msgstr ""+msgstr "cap a" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph"-msgstr ""+msgstr "Glif" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Interletratge" @@ -770,16 +751,16 @@ msgstr "" msgid "Type “space” to kern the space character and “divis” to kern -." msgstr "" -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode"-msgstr ""+msgstr "Unicode" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert"-msgstr ""+msgstr "Inserir" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Tampar" @@ -791,16 +772,16 @@ msgstr "Apròchi de paras" msgid "No kerning pairs created." msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "Tipe d'apròchi" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Atribuir" @@ -812,53 +793,56 @@ msgstr "" msgid "Kerning Tools" msgstr "" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31-#, fuzzy+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "Talha de la poliça " -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "Crear un novèl tipe d'apròchi." -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "Utilizatz la picada de tèxte per picar de valors de crenatge." -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "" -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "" -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions"-msgstr ""+msgstr "Substitucion" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39-#, fuzzy+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "Jòc de caractèrs" @@ -866,21 +850,17 @@ msgstr "Jòc de caractèrs" msgid "Character Set" msgstr "Jòc de caractèrs" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer"-msgstr ""+msgstr "Calc"  #: libbirdfont/LigatureList.vala:53 msgid "character sequence"-msgstr ""+msgstr "sequéncia de caractèrs"  #: libbirdfont/LigatureList.vala:53 msgid "ligature"-msgstr ""+msgstr "ligadura"  #: libbirdfont/LigatureList.vala:56 msgid "substitution"@@ -888,15 +868,15 @@ msgstr ""  #: libbirdfont/LigatureList.vala:56 msgid "beginning"-msgstr ""+msgstr "començament"  #: libbirdfont/LigatureList.vala:56 msgid "middle"-msgstr ""+msgstr "mitan"  #: libbirdfont/LigatureList.vala:56 msgid "end"-msgstr ""+msgstr "fin"  #: libbirdfont/LigatureList.vala:109 msgid "New Ligature"@@ -911,34 +891,33 @@ msgid "Contextual Substitutions" msgstr ""  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures"-msgstr ""+msgstr "Ligaduras" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning"-msgstr ""+msgstr "Començament" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle"-msgstr ""+msgstr "Mitan" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End"-msgstr ""+msgstr "Fin" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature"-msgstr ""+msgstr "Ligadura"  #: libbirdfont/Line.vala:157 msgid "Position"-msgstr ""+msgstr "Posicion"  #: libbirdfont/Line.vala:157-#, fuzzy msgid "Move"-msgstr "_Desplaçar"+msgstr "Desplaçar"  #: libbirdfont/LoadCallback.vala:29 msgid "This font was made with a newer version of Birdfont."@@ -956,79 +935,68 @@ msgstr "" msgid "You need an older version of Birdfont to open it." msgstr "" -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Sequéncia del glyph"  #: libbirdfont/Menu.vala:37-#, fuzzy msgid "File"-msgstr "Fichièrs"+msgstr "Fichièr"  #: libbirdfont/Menu.vala:43-#, fuzzy msgid "New"-msgstr "_Novèl"+msgstr "Novèl" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81-#, fuzzy+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files"-msgstr "Fichièrs _recents"+msgstr "Fichièrs recents"  #: libbirdfont/Menu.vala:71-#, fuzzy msgid "Save As"-msgstr "Enregistrar _jos"+msgstr "Enregistrar jos"  #: libbirdfont/Menu.vala:78-#, fuzzy msgid "Select Character Set" msgstr "Causir un jòc de caractèrs"  #: libbirdfont/Menu.vala:85-#, fuzzy msgid "Quit"-msgstr "_Sortir"+msgstr "Quitar"  #: libbirdfont/Menu.vala:93-#, fuzzy msgid "Edit"-msgstr "_Edicion"+msgstr "Editar"  #: libbirdfont/Menu.vala:106 msgid "Redo"-msgstr ""+msgstr "Restablir"  #: libbirdfont/Menu.vala:113-#, fuzzy msgid "Copy"-msgstr "_Copiar"+msgstr "Copiar"  #: libbirdfont/Menu.vala:120-#, fuzzy msgid "Paste"-msgstr "_Pegar"+msgstr "Pegar"  #: libbirdfont/Menu.vala:127-#, fuzzy msgid "Paste In Place"-msgstr "Pegar en plaça"+msgstr "Pegar sus plaça"  #: libbirdfont/Menu.vala:134-#, fuzzy msgid "Select All Paths"-msgstr "Seleccionar _Totes los Camins"+msgstr "Seleccionar totes los traçats"  #: libbirdfont/Menu.vala:141 msgid "Select All Glyphs"-msgstr ""+msgstr "Seleccionar totes los glifes"  #: libbirdfont/Menu.vala:148 msgid "Move To Baseline" msgstr "" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "Recercar" @@ -1041,14 +1009,12 @@ msgid "Merge Paths" msgstr ""  #: libbirdfont/Menu.vala:176-#, fuzzy msgid "Close Path"-msgstr "_Tampar lo camin."+msgstr "Tampar lo traçat"  #: libbirdfont/Menu.vala:183-#, fuzzy msgid "Glyph Sequence"-msgstr "_Sequéncia del glyph"+msgstr "Sequéncia de glif"  #: libbirdfont/Menu.vala:190 msgid "Set Background Glyph"@@ -1067,24 +1033,20 @@ msgid "List Guides" msgstr ""  #: libbirdfont/Menu.vala:218-#, fuzzy msgid "Select Point Above"-msgstr "_Seleccionar lo punt en dessús"+msgstr "Seleccionar lo punt en dessús"  #: libbirdfont/Menu.vala:225-#, fuzzy msgid "Select Next Point"-msgstr "Seleccionar _lo punt seguent"+msgstr "Seleccionar lo punt seguent"  #: libbirdfont/Menu.vala:232-#, fuzzy msgid "Select Previous Point"-msgstr "Seleccionar _un punt precedent."+msgstr "Seleccionar un punt precedent"  #: libbirdfont/Menu.vala:239-#, fuzzy msgid "Select Point Below"-msgstr "Seleccionar un punt en de_jós"+msgstr "Seleccionar un punt en dejós"  #: libbirdfont/Menu.vala:253 msgid "Move Layer Up"@@ -1100,121 +1062,104 @@ msgstr ""  #: libbirdfont/Menu.vala:274 msgid "Export Fonts"-msgstr ""+msgstr "Exportar las poliças"  #: libbirdfont/Menu.vala:281-#, fuzzy msgid "Export Glyph as SVG"-msgstr "_Exportar lo glyph al format SVG"+msgstr "Exportar lo glif al format SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file"-msgstr ""+msgstr "Importar un fichièr SVG" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder"-msgstr ""+msgstr "Importar un dorsièr SVG" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "Apercebut" -#: libbirdfont/Menu.vala:344-#, fuzzy+#: libbirdfont/Menu.vala:324 msgid "Tab"-msgstr "_Onglet"+msgstr "Onglet" -#: libbirdfont/Menu.vala:350-#, fuzzy+#: libbirdfont/Menu.vala:330 msgid "Next Tab"-msgstr "Onglet _seguent"+msgstr "Onglet seguent" -#: libbirdfont/Menu.vala:357-#, fuzzy+#: libbirdfont/Menu.vala:337 msgid "Previous Tab"-msgstr "Onglet _precedent"+msgstr "Onglet precedent" -#: libbirdfont/Menu.vala:364-#, fuzzy+#: libbirdfont/Menu.vala:344 msgid "Close Tab"-msgstr "_Tampar l'onglet"+msgstr "Tampar l'onglet" -#: libbirdfont/Menu.vala:371-#, fuzzy+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs"-msgstr "_Tampar totes los onglets"+msgstr "Tampar totes los onglets" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "" -#: libbirdfont/Menu.vala:385-#, fuzzy+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "Far veire l'onglet de crenatge" -#: libbirdfont/Menu.vala:392-#, fuzzy+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "Far veire l'onglet de crenatge" -#: libbirdfont/Menu.vala:399-#, fuzzy+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs"-msgstr "_Enumerar las paras de kerning"+msgstr "Enumerar las paras de crenatge" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Resumit" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr ""@@ -1248,7 +1193,11 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+msgid "Can't create TTF font."+msgstr ""++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "" @@ -1256,27 +1205,31 @@ msgstr "" msgid "Move paths" msgstr "Cambiar los camins" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "" @@ -1296,11 +1249,15 @@ msgstr "" msgid "Swashes" msgstr "" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "Filtrar" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr "Pas cap de glyph dins aqueste apercebut."++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "Vejatz tanben :" @@ -1321,43 +1278,44 @@ msgstr "Anullar" msgid "Yes, don't ask again." msgstr "" -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "" @@ -1373,7 +1331,7 @@ msgstr "" msgid "Add new points" msgstr "Apondre de punts novèls" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "Desplaçar lo punt de contraròtle" @@ -1389,21 +1347,21 @@ msgstr "Exportar las poliças" msgid "Generate html document" msgstr "Generar un document HTML" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 msgid "Glyphs"-msgstr ""+msgstr "Glifes" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 msgid "Backups"-msgstr ""+msgstr "Salvaments"  #: libbirdfont/RectangleTool.vala:30 msgid "Rectangle"@@ -1415,7 +1373,7 @@ msgstr "Talha e rotacion"  #: libbirdfont/SaveDialog.vala:36 msgid "Save changes?"-msgstr ""+msgstr "Enregistrar las modificacions ?"  #: libbirdfont/SaveDialog.vala:44 libbirdfont/SaveDialogListener.vala:30 msgid "Discard"@@ -1425,43 +1383,48 @@ msgstr "Abandonar" msgid "Save?" msgstr "Enregistrar ?" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "" -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "Utilizar las unitats TTF" -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "tradusir pas"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "" @@ -1473,289 +1436,291 @@ msgstr "" msgid "Left" msgstr "" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "Importar"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "" -#: libbirdfont/Theme.vala:423-#, fuzzy+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "Color del contorn" -#: libbirdfont/Theme.vala:424-#, fuzzy+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "Color de l'identificador" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "" @@ -1763,7 +1728,7 @@ msgstr "" msgid "Color" msgstr "" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "" @@ -1775,7 +1740,7 @@ msgstr "Dessenh a man levada" msgid "New version" msgstr "Version novèla" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "" @@ -1807,12 +1772,6 @@ msgstr "" msgid "Writing" msgstr "Escritura" -#~ msgid "No glyphs in this view."-#~ msgstr "Pas cap de glyph dins aqueste apercebut."--#~ msgid "Import"-#~ msgstr "Importar"- #~ msgid "Full name (name and style)" #~ msgstr "Nom complet (nom e estil)" diff --git a/po/pl.po b/po/pl.poindex d691641..08d158c 100644--- a/po/pl.po+++ b/po/pl.po@@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-11-05 19:53+0000\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2016-05-29 17:10+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: pl\n"@@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1446753197.000000\n"+"X-POOTLE-MTIME: 1464541857.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"@@ -85,11 +85,16 @@ msgstr "Wybierz tło" msgid "Background Image" msgstr "Obraz tła" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Przenieś, skaluj lub obróć obraz tła" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr "na osi"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Wybierz obraz tła" @@ -98,7 +103,7 @@ msgid "Images" msgstr "Obrazy"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Pliki" @@ -106,16 +111,16 @@ msgstr "Pliki" msgid "Parts" msgstr "Części" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Dodaj" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "Wybierz glif" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Otwórz"@@ -132,10 +137,6 @@ msgstr "linia" msgid "corner" msgstr "krawędź" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr "na osi"- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "Okrąg"@@ -189,18 +190,18 @@ msgid "Thai" msgstr "Tajski"  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "a b c d e f g h i j k l m n o p q r s t u v w x y z"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description" msgstr "Nazwa i opis" @@ -209,7 +210,7 @@ msgid "PostScript Name" msgstr "Nazwa PostScript"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Nazwa" @@ -237,9 +238,9 @@ msgstr "Pełna nazwa (Nazwa i styl)" msgid "Unique Identifier" msgstr "Unikalny identyfikator" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Wersja" @@ -312,7 +313,7 @@ msgstr "Linia" msgid "Geometrical Shapes" msgstr "Kształty geometryczne" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "Powiększenie" @@ -324,12 +325,16 @@ msgstr "Linie pomocnicze i Siatka" msgid "Grid Size" msgstr "Rozmiar siatki" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "Przenieś obszar roboczy" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -348,200 +353,195 @@ msgstr "Cofnij" msgid "Insert new points on path" msgstr "Wstaw nowe punkty na ścieżce" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "Stwórz kwadratowe krzywe Beziera" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "Stwórz sześcienne krzywe Beziera" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "Kwadratowa ścieżka z dwoma punktami" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Konwertuj wybrane punkty" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "Współrzędna X" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "Współrzędna Y" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "Obrót" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "Szerokość" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "Wysokość" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Połącz uchwyty krzywej dla zaznaczonego punktu edycji" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "Uchwyty symetryczne" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Konwertuj odcinek na linie" -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Zamień na krzywe" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 #, fuzzy msgid "Close path" msgstr "Zamknij ścieżkę" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 #, fuzzy msgid "Move to path to the bottom of the layer" msgstr "Przenieś do ścieżki na dolnej warstwie" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Odbij ścieżkę pionowo" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Odbij ścieżkę poziomo" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "Ustaw rozmiar dla tła" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "Pokaż/ukryj tło" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Wstaw nowe tło" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "Wysoki kontrast" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "Ustaw wartość progową tła" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "Ilość szczegółów przy trasowaniu" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "Uproszczenia trasowania" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "Obraz tła do trasowania" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "Usuń obraz tła" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "Dodaj warstwę" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "Pokaż warstwy" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "Zastosuj obrys" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Szerokość pociągnięcia" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "Stwórz krzywe z obrysu" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Pokaż linie siatki" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 #, fuzzy msgid "Show more guidelines" msgstr "Pokaż więcej linii siatki" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "Pokaż linijki na górnym i dolnym marginesie" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "Zablokuj linie pomocnicze i siatkę" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "Pomniejsz bardziej" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "Pokaż pełny glif" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "Dopasuj do widoku" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "Powiększ na obrazie tła" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "Poprzedni widok" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Następny widok" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Ustaw rozmiar siatki"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "Ustawienia eksportu" @@ -553,7 +553,7 @@ msgstr "Nazwa pliku" msgid "Units Per Em" msgstr "Jednostek na Em" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "Katalog" @@ -561,17 +561,17 @@ msgstr "Katalog" msgid "Formats" msgstr "Formaty" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "Eksportuj" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Zapisz" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "Alfabet" @@ -623,50 +623,50 @@ msgstr "Otwórz font" msgid "Save font" msgstr "Zapisz font" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr "Ustawienia"  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "Motywy" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin"-msgstr ""+msgstr "margines górny" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top"-msgstr ""+msgstr "góra" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left" msgstr "" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right" msgstr "" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "Prowadnica" @@ -678,10 +678,6 @@ msgstr "Pokaż siatkę" msgid "Guides" msgstr "Prowadnice" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr "Przybliż"@@ -710,50 +706,44 @@ msgstr "PLIK-BF" msgid "SVG-FILES ..." msgstr "PLIKI-SVG ..." -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "nie istnieje." -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "Zostanie utworzony nowy font." -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "Wystąpił błąd importu" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "Przerywanie" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "nie jest nazwą glifu lub wartością Unicode." -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "Wartości Unicode muszą zaczynać się od U+." -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "Dodawanie" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "do" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "Glif" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Kerning" @@ -769,16 +759,16 @@ msgstr "Dodaj pojedyncze znaki rozdzielone spacją i w zakresie formy A-Z." msgid "Type “space” to kern the space character and “divis” to kern -." msgstr "" -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "Unicode" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "Wstaw" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Zamknij" @@ -790,16 +780,16 @@ msgstr "" msgid "No kerning pairs created." msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Ustaw" @@ -811,52 +801,57 @@ msgstr "" msgid "Kerning Tools" msgstr "" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 #, fuzzy msgid "Font Size" msgstr "Rozmiar czcionki" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "" -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "" -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "Wstaw znak z wartości unicode" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "" -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "" -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions" msgstr "" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "Zestaw znaków" @@ -864,11 +859,7 @@ msgstr "Zestaw znaków" msgid "Character Set" msgstr "Zestaw znaków" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 #, fuzzy msgid "Layer" msgstr "Warstwy"@@ -910,23 +901,23 @@ msgid "Contextual Substitutions" msgstr ""  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "Ligatury" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "Początek" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "Środek" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "Koniec" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 #, fuzzy msgid "Ligature" msgstr "Ligatury"@@ -955,7 +946,7 @@ msgstr "" msgid "You need an older version of Birdfont to open it." msgstr "" -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Kolejność glifów" @@ -967,7 +958,7 @@ msgstr "Plik" msgid "New" msgstr "Nowa" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files" msgstr "Ostatnie pliki" @@ -1016,8 +1007,8 @@ msgstr "Zaznacz wszystkie ścieżki" msgid "Move To Baseline" msgstr "Przenieś do linii bazowej" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "Wyszukaj" @@ -1090,107 +1081,99 @@ msgstr "Eksport czcionek" msgid "Export Glyph as SVG" msgstr "Eksport glifu jako SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "Import pliku SVG" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 #, fuzzy msgid "Import SVG folder" msgstr "Import pliku SVG" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "Import obrazu tła" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "Podgląd" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 msgid "Tab" msgstr "Karta" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 msgid "Next Tab" msgstr "Następna karta" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 msgid "Previous Tab" msgstr "Poprzednia karta" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 msgid "Close Tab" msgstr "Zamknij kartę" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs" msgstr "Zamknij wszystkie karty" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "Pokaż ligatury" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "Dodaj ligaturę" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "Git" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "Zapisz jako .bfp" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Przegląd" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr ""@@ -1224,7 +1207,11 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+msgid "Can't create TTF font."+msgstr ""++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "Dodaj ligaturę" @@ -1232,27 +1219,31 @@ msgstr "Dodaj ligaturę" msgid "Move paths" msgstr "Przenieś ścieżki" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "" @@ -1272,11 +1263,15 @@ msgstr "" msgid "Swashes" msgstr "" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "Filtr" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr "W tym widoku nie ma glifów."++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "Zobacz także:" @@ -1297,43 +1292,44 @@ msgstr "Anuluj" msgid "Yes, don't ask again." msgstr "Tak, nie pytaj ponownie." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "Wszystkie glify" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "Domyślne" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "Pochyl" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "" @@ -1349,7 +1345,7 @@ msgstr "" msgid "Add new points" msgstr "Dodaj nowe punkty" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "Przenieś punkty kontrolne" @@ -1365,20 +1361,20 @@ msgstr "Eksport czcionek" msgid "Generate html document" msgstr "Utwórz dokument html" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 #, fuzzy msgid "Glyphs" msgstr "Glif" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 #, fuzzy msgid "Backups" msgstr "Kopia zapasowa"@@ -1403,43 +1399,48 @@ msgstr "Porzuć" msgid "Save?" msgstr "Czy zapisać?" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "Pokaż lub ukryj uchwyty punktów kontrolnych" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "Wypełnij otwarte ścieżki." -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "Użyj jednostek TTF." -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "Nie tłumacz"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "Przypisania klawiszy" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "Znak" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "" @@ -1451,290 +1452,294 @@ msgstr "" msgid "Left" msgstr "" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "Importuj"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 #, fuzzy msgid "Stroke Color" msgstr "Kolor rysowania" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 #, fuzzy msgid "Handle Color" msgstr "Przechwyć kolor" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 #, fuzzy msgid "Control Point Handle" msgstr "Narzędzia punktu kontrolnego" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "" @@ -1742,7 +1747,7 @@ msgstr "" msgid "Color" msgstr "" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "" @@ -1754,7 +1759,7 @@ msgstr "Odręczne rysowanie" msgid "New version" msgstr "Nowa wersja" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "Twoje czcionki zostały eksportowane." @@ -1786,12 +1791,6 @@ msgstr "Nieznany format pliku." msgid "Writing" msgstr "Pisanie" -#~ msgid "No glyphs in this view."-#~ msgstr "W tym widoku nie ma glifów."--#~ msgid "Import"-#~ msgstr "Importuj"- #~ msgid "Manufakturer" #~ msgstr "Produkcja" diff --git a/po/pt.po b/po/pt.poindex 5d4aee8..0bb8556 100644--- a/po/pt.po+++ b/po/pt.po@@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-09-22 23:15+0000\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2016-08-29 15:28+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: pt\n"@@ -16,21 +16,19 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1442963701.000000\n"+"X-POOTLE-MTIME: 1472484517.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"-msgstr "Uso"+msgstr "Utilização"  #: libbirdfont/Argument.vala:279 libbirdfont/ExportUtils.vala:19 #: birdfont-autotrace/AutoTrace.vala:68-#, fuzzy msgid "FILE" msgstr "FICHEIRO"  #: libbirdfont/Argument.vala:279 libbirdfont/ExportUtils.vala:19 #: birdfont-autotrace/AutoTrace.vala:68-#, fuzzy msgid "OPTION" msgstr "OPÇÃO" @@ -61,9 +59,8 @@ msgid "write a log file" msgstr "gravar ficheiro de registo"  #: libbirdfont/Argument.vala:287-#, fuzzy msgid "enable Machintosh customizations"-msgstr "ativar personalizações Machintosh"+msgstr "ativar personalizações Macintosh"  #: libbirdfont/Argument.vala:288 #, fuzzy@@ -90,11 +87,17 @@ msgstr "Selecionar fundo" msgid "Background Image" msgstr "Imagem de fundo" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Mover, redimensionar e rodar a imagem de fundo" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+#, fuzzy+msgid "on axis"+msgstr "no eixo"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Selecione a imagem de fundo" @@ -103,26 +106,26 @@ msgid "Images" msgstr "Imagens"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 #, fuzzy msgid "Files"-msgstr "_Ficheiro"+msgstr "Ficheiros"  #: libbirdfont/BackgroundTools.vala:38 msgid "Parts" msgstr "Partes" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Adicionar" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 #, fuzzy msgid "Select Glyph" msgstr "Escolher Símbolo" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Abrir"@@ -139,11 +142,6 @@ msgstr "linha" msgid "corner" msgstr "canto" -#: libbirdfont/BezierTool.vala:103-#, fuzzy-msgid "on axis"-msgstr "no eixo"- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "Círculo"@@ -198,18 +196,18 @@ msgid "Thai" msgstr "Tailandês"  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "a b c d e f g h i j k l m n o p q r s t u v w x y z"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description" msgstr "Nome e Descrição" @@ -218,7 +216,7 @@ msgid "PostScript Name" msgstr "Ficheiro PostScript"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Nome" @@ -246,9 +244,9 @@ msgstr "Nome completo (Nome e Estilo)" msgid "Unique Identifier" msgstr "Identificador Único" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Versão" @@ -322,7 +320,7 @@ msgstr "Contorno" msgid "Geometrical Shapes" msgstr "Formas Geométricas" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 #, fuzzy msgid "Zoom" msgstr "_Zoom"@@ -336,12 +334,16 @@ msgstr "Orientações & Grelha" msgid "Grid Size" msgstr "Tamanho da Grelha" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -361,209 +363,204 @@ msgstr "Desfazer" msgid "Insert new points on path" msgstr "" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "Criar curvas de bezier quadráticas" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "Criar curvas de bezier cúbicas" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "Endereço quadrático com duas linhas" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "Coordenada X" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "Coordenada Y" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "Rotação" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "Largura" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "Altura" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 #, fuzzy msgid "Convert segment to line." msgstr "Converter segmento para linha." -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 #, fuzzy msgid "Close path" msgstr "Fechar _Caminho" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 #, fuzzy msgid "Move to path to the bottom of the layer" msgstr "Mover para o caminho do fundo da camada" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 #, fuzzy msgid "Flip path vertically" msgstr "Virar verticalmente o caminho" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Virar horizontalmente o caminho" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "Definir o tamanho da imagem de fundo" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "Mostrar/Ocultar a imagem de fundo" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Inserir uma nova imagem de fundo" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "Alto contraste" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "Definir limite do fundo" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 #, fuzzy msgid "Delete background image" msgstr "Selecione a imagem de fundo" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "Adicionar camada" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "Aplicar contorno" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Largura do contorno" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Mostrar diretrizes" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 #, fuzzy msgid "Show more guidelines" msgstr "Mostrar diretrizes" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "Mostrar guias na margem do topo e do fundo" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "Bloquear guias e a grelha" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 #, fuzzy msgid "Zoom Out More" msgstr "Reduzir Mais a Ampliação" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 #, fuzzy msgid "Show full glyph" msgstr "Mostrar o símbolo completo" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 #, fuzzy msgid "Fit in view" msgstr "Encaixar na vista" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 #, fuzzy msgid "Zoom in on background image" msgstr "Cortar imagem de fundo" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 #, fuzzy msgid "Previous view" msgstr "Önceki görünüm" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 #, fuzzy msgid "Next view" msgstr "Sonraki görünüm" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Definir o tamanho para a grelha"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "" @@ -575,7 +572,7 @@ msgstr "Nome do Ficheiro" msgid "Units Per Em" msgstr "" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "Pasta" @@ -583,17 +580,17 @@ msgstr "Pasta" msgid "Formats" msgstr "" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "Exportar" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Guardar" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "Alfabeto" @@ -645,50 +642,51 @@ msgstr "Abrir tipo de letra" msgid "Save font" msgstr "Guardar tipo de letra" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr "Definições"  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "Temas" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left" msgstr "" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569+#, fuzzy msgid "right"-msgstr ""+msgstr "Claro" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "Guia" @@ -701,10 +699,6 @@ msgstr "Izgarayı göster" msgid "Guides" msgstr "Guias" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 #, fuzzy msgid "Zoom in"@@ -735,51 +729,45 @@ msgstr "" msgid "SVG-FILES ..." msgstr "" -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "não existe." -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "Um novo tipo de letra será criado." -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "Falha ao importar" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "A abortar" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 #, fuzzy msgid "is not the name of a glyph or a Unicode value." msgstr "não é o nome de um símbolo ou de um valor Unicode." -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "Valores Unicode devem começar por U+." -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "A adicionar" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "para" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "Símbolo" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Espaçamento" @@ -795,16 +783,16 @@ msgstr "" msgid "Type “space” to kern the space character and “divis” to kern -." msgstr "" -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "Inserir" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Fechar" @@ -816,16 +804,16 @@ msgstr "" msgid "No kerning pairs created." msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Definir" @@ -837,51 +825,57 @@ msgstr "" msgid "Kerning Tools" msgstr "" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "Tamanho da Letra" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "" -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "" -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "Inserir caracter por valor unicode" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "" -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "" -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179+#, fuzzy msgid "Substitutions"-msgstr ""+msgstr "substituição" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "" @@ -889,13 +883,10 @@ msgstr "" msgid "Character Set" msgstr "" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144+#, fuzzy msgid "Layer"-msgstr ""+msgstr "Camadas"  #: libbirdfont/LigatureList.vala:53 msgid "character sequence"@@ -935,23 +926,24 @@ msgid "Contextual Substitutions" msgstr ""  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "Início" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133+#, fuzzy msgid "Middle"-msgstr ""+msgstr "meio" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "" @@ -983,7 +975,7 @@ msgstr "" "É necessário uma versão mais antiga do Birdfont para abrir este tipo de " "letra." -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Sequência de símbolos" @@ -997,7 +989,7 @@ msgstr "_Ficheiro" msgid "New" msgstr "_Novo" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 #, fuzzy msgid "Recent Files" msgstr "Ficheiros Recentes"@@ -1053,8 +1045,8 @@ msgstr "Se_lecionar Todos os Caminhos" msgid "Move To Baseline" msgstr "" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "" @@ -1072,8 +1064,9 @@ msgid "Close Path" msgstr "Fechar _Caminho"  #: libbirdfont/Menu.vala:183+#, fuzzy msgid "Glyph Sequence"-msgstr ""+msgstr "Sequência de símbolos"  #: libbirdfont/Menu.vala:190 msgid "Set Background Glyph"@@ -1132,113 +1125,105 @@ msgstr "Exportar Tipos de Letra" msgid "Export Glyph as SVG" msgstr "_Exportar glyph como SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "Importar ficheiro SVG" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "Importar pasta SVG" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 #, fuzzy msgid "Import Background Image" msgstr "Selecione a imagem de fundo" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 #, fuzzy msgid "Preview" msgstr "Önizleme" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 #, fuzzy msgid "Tab" msgstr "_Separador" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 #, fuzzy msgid "Next Tab" msgstr "Separador Segui_nte" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 #, fuzzy msgid "Previous Tab" msgstr "Separador An_terior" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 #, fuzzy msgid "Close Tab" msgstr "_Fechar Separador" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 #, fuzzy msgid "Close All Tabs" msgstr "Fechar _Todos os Separadores" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "Guardar Como .bfp" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Resumo" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 #, fuzzy msgid "UP"@@ -1275,7 +1260,12 @@ msgstr "" msgid "Menu" msgstr "Menü" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+#, fuzzy+msgid "Can't create TTF font."+msgstr "Yeni bir yazı tipi oluştur"++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "" @@ -1283,27 +1273,31 @@ msgstr "" msgid "Move paths" msgstr "Mover Caminhos" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "" @@ -1323,11 +1317,15 @@ msgstr "" msgid "Swashes" msgstr "" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr ""++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "Ayrıca bakınız:" @@ -1349,43 +1347,44 @@ msgstr "İptal" msgid "Yes, don't ask again." msgstr "" -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "Transformar" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "Todos os Símbolos" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "Pré-definido" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "Inclinar" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "Redimensionar" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "" @@ -1401,7 +1400,7 @@ msgstr "" msgid "Add new points" msgstr "Adicionar novos pontos" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "Mover pontos de controlo" @@ -1417,19 +1416,20 @@ msgstr "Exportar tipos de letra" msgid "Generate html document" msgstr "Gerar documento html" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "Nenhum tipo de letra criado ainda" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80+#, fuzzy msgid "Glyphs"-msgstr ""+msgstr "Símbolo" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 msgid "Backups" msgstr "" @@ -1453,43 +1453,48 @@ msgstr "Ignorar" msgid "Save?" msgstr "Guardar?" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "Preencher caminhos abertos." -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "Usar unidades de TTF." -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "Número de pontos adicionados pela ferramenta de mãos livres" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "não traduzir"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "Esquema de Cor" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "Atalhos do Teclado" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "Caracter" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "Nova classe de espaçamento" @@ -1501,289 +1506,301 @@ msgstr "Espaçamento" msgid "Left" msgstr "" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277+#, fuzzy msgid "Right"-msgstr ""+msgstr "Claro" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+#, fuzzy+msgid "Import"+msgstr "İçe Aktar"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "Contorno Preenchido" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "Cor do Contorno" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 #, fuzzy msgid "Handle Color" msgstr "Gerir Cor" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "Fundo Pré-definido" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "Borda da Tabela" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 #, fuzzy msgid "Overview Glyph" msgstr "Vista de Símbolos" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452+#, fuzzy msgid "Button Border 1"-msgstr ""+msgstr "Borda do Botão 2" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453+#, fuzzy msgid "Button Background 1"-msgstr ""+msgstr "Fundo do Botão 2" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "Borda do Botão 2" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "Fundo do Botão 2" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456+#, fuzzy msgid "Button Border 3"-msgstr ""+msgstr "Borda do Botão 2" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457+#, fuzzy msgid "Button Background 3"-msgstr ""+msgstr "Fundo do Botão 2" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458+#, fuzzy msgid "Button Border 4"-msgstr ""+msgstr "Borda do Botão 2" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459+#, fuzzy msgid "Button Background 4"-msgstr ""+msgstr "Fundo do Botão 2" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "Juntar" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "Nome do Tipo de Letra" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "Novo tema" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "Adicionar um tema novo" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "Cores" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "Escuro" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "Claro" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "Personalizado" @@ -1791,7 +1808,7 @@ msgstr "Personalizado" msgid "Color" msgstr "Cor" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "" @@ -1803,7 +1820,7 @@ msgstr "" msgid "New version" msgstr "Nova Versão" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "Os seus tipos de letra foram exportados." @@ -1836,10 +1853,6 @@ msgstr "" msgid "Writing" msgstr "Yazılıyor" -#, fuzzy-#~ msgid "Import"-#~ msgstr "İçe Aktar"- #~ msgid "Unique identifier" #~ msgstr "Identificador único" @@ -2075,9 +2088,6 @@ msgstr "Yazılıyor" #~ msgid "Update name & description" #~ msgstr "İsim & açıklamayı güncelle" -#~ msgid "Create a new font"-#~ msgstr "Yeni bir yazı tipi oluştur"- #~ msgid "Preferences" #~ msgstr "Tercihler" diff --git a/po/pt_BR.po b/po/pt_BR.poindex 384d794..29dda53 100644--- a/po/pt_BR.po+++ b/po/pt_BR.po@@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-09-01 22:40+0000\n"-"Last-Translator: Anonymous Pootle User\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2016-09-02 17:12+0000\n"+"Last-Translator: PauloNeto <layoutbr@lexxa.com.br>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n"@@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1441147215.000000\n"+"X-POOTLE-MTIME: 1472836378.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"@@ -84,11 +84,16 @@ msgstr "Selecionar fundo" msgid "Background Image" msgstr "Imagem de Fundo" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Mover, redimensionar e girar imagem de fundo" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr "no eixo"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Selecionar imagem de fundo" @@ -97,7 +102,7 @@ msgid "Images" msgstr "Imagens"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Arquivos" @@ -105,16 +110,16 @@ msgstr "Arquivos" msgid "Parts" msgstr "Partes" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Adicionar" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "Selecionar Glifo" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Abrir"@@ -131,10 +136,6 @@ msgstr "linha" msgid "corner" msgstr "canto" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr "no eixo"- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "Círculo"@@ -188,18 +189,18 @@ msgid "Thai" msgstr "Tailandês"  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "a b c d e f g h i j k l m n o p q r s t u v w x y z"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description" msgstr "Nome e Descrição" @@ -208,7 +209,7 @@ msgid "PostScript Name" msgstr "Nome PostScript"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Nome" @@ -236,9 +237,9 @@ msgstr "Nome Completo (Nome e Estilo)" msgid "Unique Identifier" msgstr "Identificador Exclusivo" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Versão" @@ -252,31 +253,31 @@ msgstr "Direitos Autorais"  #: libbirdfont/DescriptionDisplay.vala:183 msgid "License"-msgstr ""+msgstr "Licença"  #: libbirdfont/DescriptionDisplay.vala:195 msgid "License URL"-msgstr ""+msgstr "URL da licença"  #: libbirdfont/DescriptionDisplay.vala:207 msgid "Trademark"-msgstr ""+msgstr "Marca registrada"  #: libbirdfont/DescriptionDisplay.vala:219 msgid "Manufacturer"-msgstr ""+msgstr "Fabricante"  #: libbirdfont/DescriptionDisplay.vala:230 msgid "Designer"-msgstr ""+msgstr "Designer"  #: libbirdfont/DescriptionDisplay.vala:241 msgid "Vendor URL"-msgstr ""+msgstr "URL do fabricante"  #: libbirdfont/DescriptionDisplay.vala:252 msgid "Designer URL"-msgstr ""+msgstr "URL do designer"  #: libbirdfont/DrawingTools.vala:112 msgid "Background Tools"@@ -310,7 +311,7 @@ msgstr "Traço" msgid "Geometrical Shapes" msgstr "Formas Geométricas" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "Ampliar/Reduzir" @@ -322,12 +323,16 @@ msgstr "Grade e Linhas de Guia" msgid "Grid Size" msgstr "Tamanho da Grade" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "Mover telas" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -346,200 +351,194 @@ msgstr "Desfazer" msgid "Insert new points on path" msgstr "Inserir novos pontos ao caminho" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "Criar curvas de Bézier quadráticas" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "Criar curvas de Bézier cúbicas" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "Caminho quadrático com duas alças de controle" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Converter pontos selecionados" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "Coordenada X" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "Coordenada Y" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "Rotação" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "Largura" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "Altura" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Vincular alças de ajuste para o ponto selecionado" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "Alavancas simétricas" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Converter segmento em linha." -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Inverter caminho" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline"-msgstr ""+msgstr "Ajustar tamanho ao topo/base da fonte" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path" msgstr "Fechar caminho" -#: libbirdfont/DrawingTools.vala:601-#, fuzzy+#: libbirdfont/DrawingTools.vala:598 msgid "Move to path to the bottom of the layer"-msgstr "Mover para caminho para camada inferior"+msgstr "Mover vetor para a camada inferior" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Inverter caminho verticalmente" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Inverter caminho horizontalmente" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "Definir tamanho da imagem de fundo" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "Exibir/ocultar a imagem de fundo" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Inserir nova imagem de fundo" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "Alto contraste" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "Definir limite de fundo" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "Quantidade de detalhes do rastreio automático" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "Simplificação do rastreio automático" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "Rastreio automático da imagem de fundo" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "Apagar imagem de fundo" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "Adicionar camada" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "Mostrar camadas" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "Aplicar traço" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Espessura do contorno" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "Criar contorno a partir de traço" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap"-msgstr ""+msgstr "Linha côncova" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap"-msgstr ""+msgstr "Linha redonda" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap"-msgstr ""+msgstr "Linha quadrada" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Exibir guias" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines"-msgstr "Mostrar mais linhas guia"+msgstr "Mostrar mais guias" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin"-msgstr "Exibir guias de margem superior e inferior"+msgstr "Exibir guias na margem superior e inferior" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid"-msgstr ""+msgstr "Bloquear guias e grade" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "Diminuir Mais" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "Exibir caractere completo" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view"-msgstr "Ajustar na visualização"+msgstr "Ajustar à visualização" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "Ampliar a imagem de fundo" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "Visualização anterior" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Próxima visualização" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Definir tamanho da grade"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings"-msgstr "Exportar Ajustes"+msgstr "Exportar Configurações"  #: libbirdfont/ExportSettings.vala:45 libbirdfont/ExportSettings.vala:60 msgid "File Name"@@ -547,9 +546,9 @@ msgstr "Nome do Arquivo"  #: libbirdfont/ExportSettings.vala:75 msgid "Units Per Em"-msgstr ""+msgstr "Unidades por Em" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "Pasta" @@ -557,19 +556,19 @@ msgstr "Pasta" msgid "Formats" msgstr "Formatos" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "Exportar" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Salvar" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet"-msgstr ""+msgstr "Alfabeto"  #: libbirdfont/ExportUtils.vala:17 libbirdfont/ImportUtils.vala:17 #: birdfont-autotrace/AutoTrace.vala:66@@ -598,12 +597,11 @@ msgstr "Não foi possível encontrar a pasta de destino"  #: libbirdfont/FileDialogTab.vala:79 msgid "Select a Folder"-msgstr ""+msgstr "Selecione uma pasta"  #: libbirdfont/FileDialogTab.vala:83-#, fuzzy msgid "Folders"-msgstr "Pasta"+msgstr "Pastas"  #: libbirdfont/FileTools.vala:31 msgid "New font"@@ -617,50 +615,50 @@ msgstr "Abrir Fonte" msgid "Save font" msgstr "Salvar Fonte" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr "Ajustes"  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "Temas" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin"-msgstr ""+msgstr "margem superior" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top"-msgstr ""+msgstr "superior" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height"-msgstr ""+msgstr "altura x" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline"-msgstr ""+msgstr "Linha de base" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom"-msgstr ""+msgstr "inferior" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin"-msgstr ""+msgstr "margem inferior" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left"-msgstr ""+msgstr "esquerda" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right"-msgstr ""+msgstr "direita" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "Guia" @@ -672,10 +670,6 @@ msgstr "Exibir grade" msgid "Guides" msgstr "Guias" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr "Aumentar zoom"@@ -690,11 +684,11 @@ msgstr "Converter o último segmento a uma linha reta"  #: libbirdfont/HiddenTools.vala:55 msgid "Convert the last control point to a corner node"-msgstr ""+msgstr "Converter o último ponto de controle para um nó de canto"  #: libbirdfont/HiddenTools.vala:63 msgid "Move handle along axis"-msgstr ""+msgstr "Mover alça ao longo do eixo"  #: libbirdfont/ImportUtils.vala:19 msgid "BF-FILE"@@ -704,50 +698,44 @@ msgstr "ARQUIVO-BF" msgid "SVG-FILES ..." msgstr "ARQUIVOS-SVG ..." -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "não existe." -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "Uma nova fonte será criada." -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "Falha ao importar" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "Abostando" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "não é um nome de um glifo ou um valor unicode." -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "Valores unicode devem começar com U+." -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "Adicionando" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "para" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "Glifo" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Espacejamento" @@ -766,16 +754,16 @@ msgstr "" "Digite \"space\" para espacejamento no caractere espaço e \"divis\" para " "espaçar -." -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "Unicode" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "Inserir" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Fechar" @@ -785,18 +773,18 @@ msgstr "Pares de Espacejamento"  #: libbirdfont/KerningList.vala:57 msgid "No kerning pairs created."-msgstr ""+msgstr "Nenhum par de espacejamento foi criado." -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "Classe de espacejamento" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Definir" @@ -808,51 +796,56 @@ msgstr "Iniciar strings de espacejamento" msgid "Kerning Tools" msgstr "Ferramentas de Espacejamento" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "Tamanho da Fonte" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "Criar nova classe de espacejamento." -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "Utilizar input de texto para definir valores de espacejamento." -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "Inserir glifo da visão geral" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "Inserir caractere pelo valor unicode" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "Abra primeiro um arquivo de texto com strings de espacejamento." -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "String de espacejamento anterior" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "Você alcançou o começo da lista." -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "String de espacejamento seguinte" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "Você alcançou o fim da lista." -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions"-msgstr ""+msgstr "substituições" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "Conjuntos de Caracteres" @@ -860,13 +853,9 @@ msgstr "Conjuntos de Caracteres" msgid "Character Set" msgstr "Conjunto de caracteres" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer"-msgstr ""+msgstr "Camadas"  #: libbirdfont/LigatureList.vala:53 msgid "character sequence"@@ -905,23 +894,23 @@ msgid "Contextual Substitutions" msgstr "Substituições Contextual"  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "Ligaduras" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "Começo" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "Meio" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "Fim" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "Ligadura" @@ -935,21 +924,21 @@ msgstr "Mover"  #: libbirdfont/LoadCallback.vala:29 msgid "This font was made with a newer version of Birdfont."-msgstr ""+msgstr "Esta fonte foi criada com uma versão mais recente de Birdfont."  #: libbirdfont/LoadCallback.vala:30 msgid "You need to upgrade your version of Birdfont."-msgstr ""+msgstr "Você precisa atualizar sua versão do Birdfont."  #: libbirdfont/LoadCallback.vala:34 msgid "This font was made with an old version of Birdfont."-msgstr ""+msgstr "Esta fonte foi criada com uma versão antiga do Birdfont."  #: libbirdfont/LoadCallback.vala:35 msgid "You need an older version of Birdfont to open it."-msgstr ""+msgstr "Você precisa de uma versão antiga do Birdfont para abri-lo." -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Sequência de caracteres" @@ -961,7 +950,7 @@ msgstr "Arquivo" msgid "New" msgstr "Novo" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files" msgstr "Arquivos Recentes" @@ -1002,16 +991,15 @@ msgid "Select All Paths" msgstr "Selecionar Todos os Caminhos"  #: libbirdfont/Menu.vala:141-#, fuzzy msgid "Select All Glyphs"-msgstr "Selecionar Todos os Caminhos"+msgstr "Selecionar todos os glifos"  #: libbirdfont/Menu.vala:148 msgid "Move To Baseline" msgstr "Mover para Linha de Base" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "Pesquisar" @@ -1021,7 +1009,7 @@ msgstr "Simplificar Caminho"  #: libbirdfont/Menu.vala:169 msgid "Merge Paths"-msgstr ""+msgstr "Mesclar caminhos"  #: libbirdfont/Menu.vala:176 msgid "Close Path"@@ -1065,126 +1053,116 @@ msgstr "Selecionar Ponto Abaixo"  #: libbirdfont/Menu.vala:253 msgid "Move Layer Up"-msgstr ""+msgstr "Mover camada para cima"  #: libbirdfont/Menu.vala:260 msgid "Move Layer Down"-msgstr ""+msgstr "Mover camada para baixo"  #: libbirdfont/Menu.vala:268 msgid "Import and Export"-msgstr ""+msgstr "Importar e Exportar"  #: libbirdfont/Menu.vala:274-#, fuzzy msgid "Export Fonts"-msgstr "Exportar fontes"+msgstr "Exportar Fontes"  #: libbirdfont/Menu.vala:281 msgid "Export Glyph as SVG" msgstr "Exportar Glifo Como SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "Exportar arquivo SVG" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313-#, fuzzy+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder"-msgstr "Exportar arquivo SVG"--#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""+msgstr "Importar Pasta SVG" -#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "Importar Imagem de Fundo" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "Pré-visualização" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 msgid "Tab" msgstr "Aba" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 msgid "Next Tab" msgstr "Aba Seguinte" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 msgid "Previous Tab" msgstr "Aba Anterior" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 msgid "Close Tab" msgstr "Fechar Aba" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs" msgstr "Fechar Todas as Abas" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "Espaçamento e Espacejamento" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "Mostrar Espaçamento da Aba" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "Mostrar Espacejamento da Aba" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "Listar Pares de Espacejamento" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "Classes de Espaçamento" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "Selecionar Par de Espacejamento Seguinte" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "Selecionar Par de Espacejamento Anterior" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "Carregar Strings de Espacejamento" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "Recarregar Strings de Espacejamento" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "Mostrar Ligaduras" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "Adicionar Ligadura" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "Git" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "Salvar Como .bfp" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Resumo" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr "SUPERIOR"@@ -1209,6 +1187,8 @@ msgstr "Metadados ausentes na fonte:" msgid "" "You need to choose a different name for the TTF file with Mac adjustmets." msgstr ""+"Você precisa escolher um nome diferente para o arquivo TTF com ajustes do "+"Mac."  #: libbirdfont/MenuTab.vala:146 msgid "You need to save your font before exporting it."@@ -1218,7 +1198,12 @@ msgstr "Você precisa salvar sua fonte antes de exportá-la." msgid "Menu" msgstr "Menu" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+#, fuzzy+msgid "Can't create TTF font."+msgstr "Criar uma nova fonte"++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "Adicionar ligadura" @@ -1226,51 +1211,59 @@ msgstr "Adicionar ligadura" msgid "Move paths" msgstr "Mover caminhos" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions"-msgstr ""+msgstr "Substituições de glifo" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph"-msgstr ""+msgstr "Novo glifo" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement"-msgstr ""+msgstr "Substituição" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag"+msgstr "Etiqueta"++#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for." msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name"-msgstr ""+msgstr "Nome do glifo" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names."-msgstr ""+msgstr "Todos os glifos devem ter nomes exclusivos."  #: libbirdfont/OtfLabel.vala:47 msgid "Stylistic Alternate"-msgstr ""+msgstr "Estilização alternativa"  #: libbirdfont/OtfLabel.vala:49 msgid "Small Caps"-msgstr ""+msgstr "Letras minúsculas"  #: libbirdfont/OtfLabel.vala:51 msgid "Capitals to Small Caps"-msgstr ""+msgstr "Letras maiúsculas para minúsculas"  #: libbirdfont/OtfLabel.vala:53 msgid "Swashes"-msgstr ""+msgstr "Ornamentação" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "Filtrar" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr "Nenhum caractere para exibição."++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "Veja também:" @@ -1291,59 +1284,60 @@ msgstr "Cancelar" msgid "Yes, don't ask again." msgstr "Sim, não pergunte novamente." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform"-msgstr ""+msgstr "Transformar" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master"-msgstr ""+msgstr "Vários principais" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "Todos os Glifos" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "Padrão" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "Inclinação" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize"-msgstr ""+msgstr "Redimensionar" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate"-msgstr ""+msgstr "Criar alternativa" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation"-msgstr ""+msgstr "Definir orientação da curva" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size"-msgstr ""+msgstr "Tamanho principal" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font"-msgstr ""+msgstr "Criar nova fonte principal"  #: libbirdfont/OverwriteBfFile.vala:25 msgid "This file already exists. Do you want to replace it?"-msgstr ""+msgstr "Este arquivo já existe. Você gostaria de substituí-lo?"  #: libbirdfont/OverwriteBfFile.vala:27 msgid "Replace"-msgstr ""+msgstr "Substituir"  #: libbirdfont/PenTool.vala:82 msgid "Add new points" msgstr "Adicionar novos pontos" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "Mover alças de controle" @@ -1359,19 +1353,19 @@ msgstr "Exportar fontes" msgid "Generate html document" msgstr "Gerar documento HTML" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet"-msgstr ""+msgstr "Nenhuma fonte foi criada ainda" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font"-msgstr ""+msgstr "Criar uma nova fonte" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 msgid "Glyphs" msgstr "Glifos" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 msgid "Backups" msgstr "Backups" @@ -1395,43 +1389,48 @@ msgstr "Descartar" msgid "Save?" msgstr "Salvar?" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "Precisão da ferramenta caneta" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "Mostrar ou ocultar alças do ponto de controle" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "Preencher caminhos abertos." -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "Utilizar unidades TTF." -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "Número de pontos adicionados pela ferramenta mão livre" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "Limitar simplificação do caminho" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "não traduzir"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme"-msgstr ""+msgstr "Tema de cor" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "Vínculos Chave" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "Caractere" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "Nova classe de espaçamento" @@ -1443,303 +1442,301 @@ msgstr "Espaçamento" msgid "Left" msgstr "Esquerda" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "Direita" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "Importar"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background"-msgstr ""+msgstr "Fundo de tela" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke"-msgstr ""+msgstr "Traçado preenchido" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "Cor do Traço" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "Cor da Alça" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "Cor de Preenchimento" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "Objetos Selecionados" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "Fundo 1" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background"-msgstr ""+msgstr "Fundo do diálogo" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background"-msgstr ""+msgstr "Fundo do menu" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background"-msgstr ""+msgstr "Fundo padrão" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "Fundo da Caixa de Seleção" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "Primeiro Plano 1" -#: libbirdfont/Theme.vala:436-#, fuzzy+#: libbirdfont/Theme.vala:434 msgid "Text Foreground"-msgstr "Menu de Primeiro Plano"+msgstr "Primeiro plano do texto" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border"-msgstr ""+msgstr "Borda da tabela" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border"-msgstr ""+msgstr "Borda da seleção" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph"-msgstr ""+msgstr "Visão geral do glifo" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "Inverter Primeiro Plano" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "Menu de Primeiro Plano" -#: libbirdfont/Theme.vala:442-#, fuzzy+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground"-msgstr "Ferramenta de Primeiro Plano Selecionada"+msgstr "Aba de Primeiro Plano Selecionada" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator"-msgstr ""+msgstr "Separador da aba" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "Realçado 1" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "Guia Realçada" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "Grade" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "Guia 1" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "Guia 2" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "Guia 3" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "Borda do Botão 1" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "Fundo do Botão 1" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "Borda do Botão 2" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "Fundo do Botão 2" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "Borda do Botão 3" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "Fundo do Botão 3" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "Borda do Botão 4" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "Fundo do Botão 4" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "Primeiro Plano do Botão" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "Primeiro Plano do Botão Selecionado" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "Ferramenta de Primeiro Plano" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "Ferramenta de Primeiro Plano Selecionada" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "Fundo da Área de Texto" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border"-msgstr ""+msgstr "Borda do Item visão geral" -#: libbirdfont/Theme.vala:473-#, fuzzy+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item"-msgstr "Item Selecionado da Visão Geral 1"+msgstr "Item de Visão Geral Selecionado" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "Item da Visão Geral 1" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "Item da Visão Geral 2" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "Primeiro Plano da Visão Geral Selecionada" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "Primeiro Plano da Visão Geral" -#: libbirdfont/Theme.vala:480-#, fuzzy+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1"-msgstr "Fundo da Contagem de Glifos"+msgstr "Fundo da contagem de glifo 1" -#: libbirdfont/Theme.vala:481-#, fuzzy+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2"-msgstr "Fundo da Contagem de Glifos"+msgstr "Fundo da contagem de glifo 2" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "Sombra do Diálogo" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "Ponto de Controle Cúbico Ativo Selecionado" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "Ponto de Controle Cúbico Selecionado" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "Ponto de Controle Cúbico Ativo" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "Ponto de Controle Cúbico" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "Ponto de Controle Quadrático Ativo Selecionado" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "Ponto de Controle Quadrático Selecionado" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "Ponto de Controle Quadrático Selecionado" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "Ponto Quadrático Cúbico" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "Alça do Ponto de Controle Selecionado" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle"-msgstr ""+msgstr "Alça ativa" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "Alça do Ponto de Controle" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "Mesclar" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button"-msgstr ""+msgstr "Botão giratório" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button"-msgstr ""+msgstr "Botão giratório ativo" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border"-msgstr ""+msgstr "Borda da barra de ampliação" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name"-msgstr ""+msgstr "Nome da fonte" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "Novo Tema" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "Adicionar novo tema" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "Cores" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark"-msgstr ""+msgstr "Escuro" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright"-msgstr ""+msgstr "Claro" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom"-msgstr ""+msgstr "Personalizado"  #: libbirdfont/ThemeTools.vala:30-#, fuzzy msgid "Color"-msgstr "Cores"+msgstr "Cor" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift"-msgstr ""+msgstr "Deslocamento"  #: libbirdfont/TrackTool.vala:57 msgid "Freehand drawing"@@ -1749,7 +1746,7 @@ msgstr "Ferramenta Mão Livre" msgid "New version" msgstr "Nova versão" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "Suas fontes foram exportadas com sucesso." @@ -1781,11 +1778,9 @@ msgstr "Formato de arquivo desconhecido." msgid "Writing" msgstr "Gravando" -#~ msgid "No glyphs in this view."-#~ msgstr "Nenhum caractere para exibição."--#~ msgid "Import"-#~ msgstr "Importar"+#, fuzzy+#~ msgid "color"+#~ msgstr "Cores"  #~ msgid "Full name (name and style)" #~ msgstr "Nome completo (nome e estilo)"@@ -2229,9 +2224,6 @@ msgstr "Gravando" #~ msgid "Update name & description" #~ msgstr "Atualizar nome e descrição" -#~ msgid "Create a new font"-#~ msgstr "Criar uma nova fonte"- #~ msgid "Add name and description to this font." #~ msgstr "Adicionar nome e descrição para esta fonte." diff --git a/po/ru.po b/po/ru.poindex 29dbe22..d540b31 100644--- a/po/ru.po+++ b/po/ru.po@@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-12-19 11:24+0000\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2016-10-29 00:16+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: ru\n"@@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1450524279.000000\n"+"X-POOTLE-MTIME: 1477700210.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"@@ -42,13 +42,13 @@ msgid "show coordinate in glyph view" msgstr "показывать координаты при просмотре глифа"  #: libbirdfont/Argument.vala:283-#, fuzzy msgid "exit if a test case fails"-msgstr "выйти, если тест неудачен"+msgstr "выйти если тест неудался" +# Запятая #: libbirdfont/Argument.vala:284 msgid "treat warnings as fatal"-msgstr "рассматривать предупреждение как критическую ошибку"+msgstr "рассматривать предупреждение, как критическую ошибку"  #: libbirdfont/Argument.vala:285 msgid "show this message"@@ -79,19 +79,23 @@ msgid "run test case" msgstr "запустить тест"  #: libbirdfont/BackgroundSelectionTool.vala:23-#, fuzzy msgid "Select background"-msgstr "Выбор фона"+msgstr "Выбрать цвет фона"  #: libbirdfont/BackgroundTab.vala:47 libbirdfont/BackgroundTools.vala:26 msgid "Background Image" msgstr "Фоновое изображение" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Перемещение, изменение размера и поворот фонового изображения" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr "на оси"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Выбор фонового изображения" @@ -100,7 +104,7 @@ msgid "Images" msgstr "картинки"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Файлы" @@ -108,16 +112,16 @@ msgstr "Файлы" msgid "Parts" msgstr "Части" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Добавить" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "выбрать глифф" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Открыть"@@ -134,11 +138,6 @@ msgstr "линия" msgid "corner" msgstr "угол" -#: libbirdfont/BezierTool.vala:103-#, fuzzy-msgid "on axis"-msgstr "Ось Y"- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "Круг"@@ -192,18 +191,18 @@ msgid "Thai" msgstr "Тайский"  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "а б в г д е ё ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr "А Б В Г Д Е Ё Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я"  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description" msgstr "Название и описание" @@ -212,7 +211,7 @@ msgid "PostScript Name" msgstr "название PostScript-а"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Название" @@ -240,9 +239,9 @@ msgstr "Полное Название(имя и стиль)" msgid "Unique Identifier" msgstr "Уникальный идентификатор" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Версия" @@ -299,9 +298,8 @@ msgid "Drawing Tools" msgstr "Инструменты рисования"  #: libbirdfont/DrawingTools.vala:124-#, fuzzy msgid "Control Point"-msgstr "Контрольные точки"+msgstr "Контрольная точка"  #: libbirdfont/DrawingTools.vala:126 libbirdfont/Menu.vala:247 msgid "Layers"@@ -315,7 +313,7 @@ msgstr "Обводка" msgid "Geometrical Shapes" msgstr "Геометрические фигуры" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "Масштаб" @@ -328,12 +326,16 @@ msgstr "Направляющие Линии" msgid "Grid Size" msgstr "Размер сетки" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "Перемещение холста" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -353,201 +355,196 @@ msgstr "Отмена" msgid "Insert new points on path" msgstr "Вставить новые точки на путь" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "Создать квадратную кривую Безье" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "Создать кубическую кривую Безье" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "Путь с двумя управляющими рычагами" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Преобразовать выбранные точки" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "Координата по X" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "Координата по Y" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "Вращение" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "Ширина" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "Высота" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Рычаги управления узла" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "Симметричные рычаги" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Конвертировать сегмент в линию" -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Создать контур из линии" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline"-msgstr ""+msgstr "Масштабировать объект к верхней/базовой линии шрифта" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 #, fuzzy msgid "Close path" msgstr "_Замкнуть контур" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 #, fuzzy msgid "Move to path to the bottom of the layer" msgstr "Переместить контур на слой ниже" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Отразить путь по вертикали" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Отразить путь по горизонтали" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "Установить размер фонового изображения" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "Показать/Спрятать фоновое изображение" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Вставить новое фоновое изображение"  # Высокая контрастность is too long, maybe contrast “Contrast style” can work as a replacement.-#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "Контрастный стиль" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "Установить порог фона" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "Детализация автотрассировки" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "Упрощение результата автотрассировки" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "Автотрасcировка фонового изображения" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "Удалить фоновую картинку" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "Добавить слой" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "Показать слои" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "Применить" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Толщина контура" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "Создать линию контура" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "верх линии полигона" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "Верх круга" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "Верх квадрата" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Показать направляющие" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines" msgstr "Показать указания" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "Показать ограничители верхних и нижних полей" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "Заблокировать направляюшие и сеть" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "Уменьшить" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "Показать глиф полностью" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "Уместить в окне" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 #, fuzzy msgid "Zoom in on background image" msgstr "Увеличить фоновое изображение" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "Предыдущая вкладка" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Следующая вкладка" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Установить размер сетки"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "Настройки эксперта" @@ -559,7 +556,7 @@ msgstr "Имя файла" msgid "Units Per Em" msgstr "" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "Каталог" @@ -567,17 +564,17 @@ msgstr "Каталог" msgid "Formats" msgstr "Форматы" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "Экспортировать" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Сохранить" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "Алфавит" @@ -592,9 +589,8 @@ msgid "print this message" msgstr "распечатать это сообщение\n"  #: libbirdfont/ExportUtils.vala:21-#, fuzzy msgid "write files to this directory"-msgstr "распечатать это сообщение"+msgstr "сохранить файлы в эту папкуbb"  #: libbirdfont/ExportUtils.vala:22 #, fuzzy@@ -630,50 +626,50 @@ msgstr "Открыть файл шрифта" msgid "Save font" msgstr "Сохранить файл шрифта" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr "Настройки"  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "Темы" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "Отступ сверху" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "верх" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "высота по Х" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "Базовая линия" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "низ" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "Отступ снизу:" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left" msgstr "влево" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right" msgstr "вправо" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "Гид" @@ -685,10 +681,6 @@ msgstr "Показать сетку" msgid "Guides" msgstr "Направляющие" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr "Увеличить"@@ -717,50 +709,44 @@ msgstr "BF-файл" msgid "SVG-FILES ..." msgstr "SVG-файлы" -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr " не существует." -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "Новый шрифт будет создан." -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "Не удалось импортировать" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "отменяется" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "не является названием глифа или кодом Юникод символа" -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "коды Юникода должны начинаться с U+." -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "Добавление" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "к" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "Глиф" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Кернинг" @@ -771,21 +757,23 @@ msgstr "Неверный формат текущего класса кернин #: libbirdfont/KerningDisplay.vala:110 msgid "Add single characters separated by space and ranges on the form A-Z." msgstr ""+"Добавьте отдельные символы, разделенные пробелом, и находящиеся в диапазоне "+"A-Z"  #: libbirdfont/KerningDisplay.vala:111 msgid "Type “space” to kern the space character and “divis” to kern -." msgstr "" -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "Юникод" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "Вставить" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Закрыть" @@ -797,73 +785,78 @@ msgstr "Кернинговые пары" msgid "No kerning pairs created." msgstr "Кернинговые пары не были созданы" -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "Класс кернинга" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Набор"  #: libbirdfont/KerningStrings.vala:65 msgid "Load kerning strings"-msgstr ""+msgstr "Загрузка кернинга строки"  #: libbirdfont/KerningTools.vala:56 msgid "Kerning Tools"-msgstr ""+msgstr "Инструменты кернинга" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "Размер шрифта" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class."-msgstr ""+msgstr "Создать новый класс кернинга" -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values."-msgstr ""+msgstr "Используйте текстовое поле для ввода значений кернинга" -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "Вставить глиф из превью" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "Вставить символ юникод" -#: libbirdfont/KerningTools.vala:124-msgid "Open a text file with kerning strings first."+#: libbirdfont/KerningTools.vala:130+msgid "Right to left" msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:139+msgid "Open a text file with kerning strings first."+msgstr "Сначала откройте текстовый файл с кернингом строк."++#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string"-msgstr ""+msgstr "Предыдущий кернинг строки" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "Вы достигли начало списка" -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string"-msgstr ""+msgstr "Следующий кернинг строки" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "Вы достигли конец списка" -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 #, fuzzy msgid "Substitutions" msgstr "Подстановка" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "Наборы символов" @@ -871,11 +864,7 @@ msgstr "Наборы символов" msgid "Character Set" msgstr "Набор символов" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 #, fuzzy msgid "Layer" msgstr "Слой"@@ -922,23 +911,23 @@ msgid "Contextual Substitutions" msgstr "Контекстная подстановка"  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "Лигатуры" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "Начало" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "Середина" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "Конец" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 #, fuzzy msgid "Ligature" msgstr "Лигатуры"@@ -969,7 +958,7 @@ msgstr "Этот шрифт сделан в старой версии Birdfont." msgid "You need an older version of Birdfont to open it." msgstr "Вам нужна более ранняя версия Birdfont чтобы открыть его." -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Последовательность глифов" @@ -983,7 +972,7 @@ msgstr "Файл" msgid "New" msgstr "Новый" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 #, fuzzy msgid "Recent Files" msgstr "Последние файлы"@@ -1037,20 +1026,20 @@ msgstr "Выделить все контуры"  #: libbirdfont/Menu.vala:148 msgid "Move To Baseline"-msgstr ""+msgstr "Переместить к базовой линии" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "Поиск"  #: libbirdfont/Menu.vala:162 msgid "Simplify Path"-msgstr ""+msgstr "Упростить контур"  #: libbirdfont/Menu.vala:169 msgid "Merge Paths"-msgstr ""+msgstr "Объединить контуры"  #: libbirdfont/Menu.vala:176 #, fuzzy@@ -1064,19 +1053,19 @@ msgstr "Последовательность глифов"  #: libbirdfont/Menu.vala:190 msgid "Set Background Glyph"-msgstr ""+msgstr "Установить фоновый глиф"  #: libbirdfont/Menu.vala:197 msgid "Remove Background Glyph"-msgstr ""+msgstr "Удалить фоновый глиф"  #: libbirdfont/Menu.vala:204 msgid "Create Guide"-msgstr ""+msgstr "Создать направляющую"  #: libbirdfont/Menu.vala:211 msgid "List Guides"-msgstr ""+msgstr "Список направляющих"  #: libbirdfont/Menu.vala:218 #, fuzzy@@ -1108,7 +1097,7 @@ msgstr "Переместить слой вниз"  #: libbirdfont/Menu.vala:268 msgid "Import and Export"-msgstr ""+msgstr "Импорт и экспорт"  #: libbirdfont/Menu.vala:274 msgid "Export Fonts"@@ -1119,136 +1108,130 @@ msgstr "Экспортировать шрифты" msgid "Export Glyph as SVG" msgstr "Экспортировать глиф как SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "Импорт SVG файла" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "Импорт SVG из каталога" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 #, fuzzy msgid "Import Background Image" msgstr "Импорт фонового изображения" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "Предпросмотр" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 #, fuzzy msgid "Tab" msgstr "Вкладка" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 #, fuzzy msgid "Next Tab" msgstr "Следующая вкладка" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 #, fuzzy msgid "Previous Tab" msgstr "Предыдущая вкладка" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 #, fuzzy msgid "Close Tab" msgstr "Закрыть вкладку" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 #, fuzzy msgid "Close All Tabs" msgstr "Закрыть все вкладки" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning"-msgstr ""+msgstr "Интервалы и Кернинг" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab"-msgstr ""+msgstr "Показать вкладку интервалов" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab"-msgstr ""+msgstr "Показать вкладку кернинга" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs"-msgstr ""+msgstr "Список кернинговых пар" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97+#, fuzzy msgid "Spacing Classes"-msgstr ""+msgstr "Классы интервалов" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair"-msgstr ""+msgstr "Выбрать следующую кернинговую пару" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair"-msgstr ""+msgstr "Выбрать предыдущую пару кернинга" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings"-msgstr ""+msgstr "Загрузить кернинг строки" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings"-msgstr ""+msgstr "Обновить кернинг строки" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures"-msgstr ""+msgstr "Показать лигатуры" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "Добавить компонент" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "Git" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "Сохранить как .bfp" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Обзор" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP"-msgstr ""+msgstr "ВВЕРХ"  #: libbirdfont/MenuItem.vala:85 msgid "DOWN"-msgstr ""+msgstr "ВНИЗ"  #: libbirdfont/MenuItem.vala:88 msgid "LEFT"-msgstr ""+msgstr "ВЛЕВО"  #: libbirdfont/MenuItem.vala:91 msgid "RIGHT"-msgstr ""+msgstr "ВПРАВО"  #: libbirdfont/MenuTab.vala:95 msgid "Missing metadata in font:" msgstr "Недостающие метаданные шрифта:"  #: libbirdfont/MenuTab.vala:128+#, fuzzy msgid "" "You need to choose a different name for the TTF file with Mac adjustmets."-msgstr ""+msgstr "Вы должны выбрать другое имя для файла TTF с корректировками для МАС"  #: libbirdfont/MenuTab.vala:146 msgid "You need to save your font before exporting it."@@ -1258,7 +1241,11 @@ msgstr "Необходимо сохранить шрифт перед экспо msgid "Menu" msgstr "Меню" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+msgid "Can't create TTF font."+msgstr ""++#: libbirdfont/MenuTab.vala:702 #, fuzzy msgid "Add ligature" msgstr "Добавить компонент"@@ -1267,33 +1254,38 @@ msgstr "Добавить компонент" msgid "Move paths" msgstr "Перемещение контура" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions"-msgstr ""+msgstr "Замены глифа" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph"-msgstr ""+msgstr "Новый глиф" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement"-msgstr ""+msgstr "Замена" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag"+msgstr "Тег"++#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for." msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name"-msgstr ""+msgstr "Имя глифа" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names."-msgstr ""+msgstr "Все глифы должны иметь уникальные имена"  #: libbirdfont/OtfLabel.vala:47+#, fuzzy msgid "Stylistic Alternate"-msgstr ""+msgstr "Стилистическая альтернатива"  #: libbirdfont/OtfLabel.vala:49 msgid "Small Caps"@@ -1307,13 +1299,17 @@ msgstr "" msgid "Swashes" msgstr "" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "Фильтр" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr "Не показывать глиф"++#: libbirdfont/OverView.vala:1562 msgid "See also:"-msgstr ""+msgstr "Смотрите также:"  #: libbirdfont/OverWriteDialogListener.vala:30 msgid "Overwrite TTF file?"@@ -1332,65 +1328,66 @@ msgstr "Отмена" msgid "Yes, don't ask again." msgstr "Да, больше не спрашивать." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "Все глифы" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default"-msgstr ""+msgstr "По умолчанию" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "Искривление" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize"-msgstr ""+msgstr "Изменить размер" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation"-msgstr ""+msgstr "Установить ориентацию кривой" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size"-msgstr ""+msgstr "Мастер-размер" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font"-msgstr ""+msgstr "Создать новый мастер-шрифт"  #: libbirdfont/OverwriteBfFile.vala:25 msgid "This file already exists. Do you want to replace it?"-msgstr ""+msgstr "Файл уже существует. Хотите заменить его?"  #: libbirdfont/OverwriteBfFile.vala:27 msgid "Replace"-msgstr ""+msgstr "Заменить"  #: libbirdfont/PenTool.vala:82 msgid "Add new points" msgstr "Добавить узлы" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points"-msgstr ""+msgstr "Переместить контрольную точку"  #: libbirdfont/PreviewTools.vala:27 msgid "Reload webview"-msgstr ""+msgstr "Обновить веб-вид"  #: libbirdfont/PreviewTools.vala:33 msgid "Export fonts"@@ -1400,20 +1397,20 @@ msgstr "Экспорт шрифтов" msgid "Generate html document" msgstr "Создать документ HTML" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet"-msgstr ""+msgstr "Нет созданных шрифтов" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font"-msgstr ""+msgstr "Создать новый шрифт" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 #, fuzzy msgid "Glyphs" msgstr "Глифы" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 #, fuzzy msgid "Backups" msgstr "Резервные копии"@@ -1424,11 +1421,11 @@ msgstr "Прямоугольник"  #: libbirdfont/ResizeTool.vala:49 msgid "Resize and rotate paths"-msgstr ""+msgstr "Изменение размера и поворот контура"  #: libbirdfont/SaveDialog.vala:36 msgid "Save changes?"-msgstr ""+msgstr "Сохранить изменения?"  #: libbirdfont/SaveDialog.vala:44 libbirdfont/SaveDialogListener.vala:30 msgid "Discard"@@ -1438,44 +1435,49 @@ msgstr "Не сохранять" msgid "Save?" msgstr "Сохранить?" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool"-msgstr ""+msgstr "Точность для инструмента \"перо\"" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "" -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "Использовать единицы TTF" -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 #, fuzzy msgid "Path simplification threshold" msgstr "Порог упрощения" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "не переводить"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme"-msgstr ""+msgstr "Цветовая тема" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "Символ" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "" @@ -1484,301 +1486,318 @@ msgid "Spacing" msgstr ""  #: libbirdfont/SpacingTab.vala:232+#, fuzzy msgid "Left"-msgstr ""+msgstr "влево" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277+#, fuzzy msgid "Right"-msgstr ""+msgstr "вправо" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "Импортировать"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 #, fuzzy msgid "Stroke Color" msgstr "Цвет контура" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 #, fuzzy msgid "Handle Color" msgstr "Цвет рычага" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects"-msgstr ""+msgstr "Выбранные объекты" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1"-msgstr ""+msgstr "Фоновое изображение 1" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background"-msgstr ""+msgstr "Диалоговое окно фона" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background"-msgstr ""+msgstr "Меню фона" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background"-msgstr ""+msgstr "Стандартное фоновое изображение" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background"-msgstr ""+msgstr "Флажок фона" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1"-msgstr ""+msgstr "Передний план 1" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground"-msgstr ""+msgstr "Текст переднего плана" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border"-msgstr ""+msgstr "Границы таблицы" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border"-msgstr ""+msgstr "Выбор границы" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439+#, fuzzy msgid "Menu Foreground"-msgstr ""+msgstr "Текст переднего плана" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448+#, fuzzy msgid "Guide 1"-msgstr ""+msgstr "Направляющая 3" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449+#, fuzzy msgid "Guide 2"-msgstr ""+msgstr "Направляющая 3" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3"-msgstr ""+msgstr "Направляющая 3" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1"-msgstr ""+msgstr "Кнопка границы 1" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1"-msgstr ""+msgstr "Кнопка фонового изображения 1" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2"-msgstr ""+msgstr "Кнопка границы 2" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2"-msgstr ""+msgstr "Кнопка фонового изображения 2" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456+#, fuzzy msgid "Button Border 3"-msgstr ""+msgstr "Кнопка границы 1" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457+#, fuzzy msgid "Button Background 3"-msgstr ""+msgstr "Кнопка фонового изображения 1" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458+#, fuzzy msgid "Button Border 4"-msgstr ""+msgstr "Кнопка границы 1" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459+#, fuzzy msgid "Button Background 4"-msgstr ""+msgstr "Кнопка фонового изображения 1" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464+#, fuzzy msgid "Tool Foreground"-msgstr ""+msgstr "Текст переднего плана" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 #, fuzzy msgid "Control Point Handle" msgstr "Инструменты для контрольных точек" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109+#, fuzzy msgid "Colors"-msgstr ""+msgstr "цвет" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154+#, fuzzy msgid "Bright"-msgstr ""+msgstr "вправо" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr ""  #: libbirdfont/ThemeTools.vala:30+#, fuzzy msgid "Color"-msgstr ""+msgstr "цвет" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "" @@ -1790,7 +1809,7 @@ msgstr "" msgid "New version" msgstr "Новая версия" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "" @@ -1817,17 +1836,14 @@ msgstr " не существует."  #: birdfont-autotrace/AutoTrace.vala:98 msgid "Unknown file format."-msgstr ""+msgstr "Неизвестный формат файла."  #: birdfont-autotrace/AutoTrace.vala:114 msgid "Writing" msgstr "Запись" -#~ msgid "No glyphs in this view."-#~ msgstr "Не показывать глиф"--#~ msgid "Import"-#~ msgstr "Импортировать"+#~ msgid "color"+#~ msgstr "цвет"  #, fuzzy #~ msgid "Full name (name and style)"diff --git a/po/sk.po b/po/sk.poindex 782c299..e2c21a1 100644--- a/po/sk.po+++ b/po/sk.po@@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-09-08 14:34+0000\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2016-08-18 06:58+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: sk\n"@@ -16,12 +16,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1441722874.000000\n"+"X-POOTLE-MTIME: 1471503526.000000\n"  #: libbirdfont/Argument.vala:277-#, fuzzy msgid "Usage"-msgstr "connot be found"+msgstr "Použitie"  #: libbirdfont/Argument.vala:279 libbirdfont/ExportUtils.vala:19 #: birdfont-autotrace/AutoTrace.vala:68@@ -63,9 +62,8 @@ msgid "enable Machintosh customizations" msgstr "Povoliť prispôsobenia pre Mac"  #: libbirdfont/Argument.vala:288-#, fuzzy msgid "enable Windows customizations"-msgstr "povoliť prispôsobenia pre Android"+msgstr "povoliť prispôsobenia pre Windows"  #: libbirdfont/Argument.vala:289 msgid "don't translate"@@ -87,11 +85,16 @@ msgstr "vyber pozadie" msgid "Background Image" msgstr "Obrázok pozadia" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Posunúť, zmeniť veľkosť a otočiť obrázok pozadia" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr "na osi"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Vybrať obrázok pozadia" @@ -100,25 +103,24 @@ msgid "Images" msgstr "Obrázok"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106-#, fuzzy+#: libbirdfont/RecentFiles.vala:110 msgid "Files"-msgstr "Súbor"+msgstr "Súbory"  #: libbirdfont/BackgroundTools.vala:38 msgid "Parts"-msgstr ""+msgstr "Časti" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Pridať" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Otvoriť"@@ -135,10 +137,6 @@ msgstr "čiara" msgid "corner" msgstr "roh" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr ""- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "Kruh"@@ -194,14 +192,14 @@ msgid "Thai" msgstr ""  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "" "a á ä b c č d ď dz dž e é f g h ch i íj k l ĺľ m n ň o ó ô p q r ŕ s š t ť u " "ú v w x y ý z ž"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr "" "A Á Ä B C Č D Ď DZ DŽ E É F G H CH I Í J K L Ĺ Ľ M N Ň O Ó Ô P Q R Ŕ S Š T Ť "@@ -209,7 +207,7 @@ msgstr ""  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 #, fuzzy msgid "Name and Description" msgstr "Názov a Popis"@@ -219,7 +217,7 @@ msgid "PostScript Name" msgstr "Názov PostScriptu"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "" @@ -248,9 +246,9 @@ msgstr "" msgid "Unique Identifier" msgstr "" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Verzia" @@ -322,7 +320,7 @@ msgstr "" msgid "Geometrical Shapes" msgstr "" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "" @@ -334,12 +332,16 @@ msgstr "" msgid "Grid Size" msgstr "" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "Posunúť plátno" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -358,202 +360,197 @@ msgstr "Späť" msgid "Insert new points on path" msgstr "Pridať nové body na cestu" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "Vytvoriť kvadratické Bézierove krivky" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 #, fuzzy msgid "Create cubic Bézier curves" msgstr "Vytvoriť kvadratické Bézierove krivky" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "Výška" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Spojiť úchyty krivky vybraného bodu" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "Symetrické úchyty" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Previesť segment na čiaru" -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 #, fuzzy msgid "Close path" msgstr "Uzavrieť cestu" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 #, fuzzy msgid "Move to path to the bottom of the layer" msgstr "Presunúť cestu do spodnej vrstvy" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Zrkadliť vertikálne" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Zrkadliť horizontálne" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 #, fuzzy msgid "Delete background image" msgstr "Vybrať obrázok pozadia" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Hrúbka ťahu" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Zobraziť vodítka" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 #, fuzzy msgid "Show more guidelines" msgstr "Zobraziť vodítka" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "Zobraziť vodítka na hornom a dolnom okraji" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "Ukázať celý znak" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Nastaviť veľkosť mriežky"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "" @@ -565,7 +562,7 @@ msgstr "" msgid "Units Per Em" msgstr "" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "" @@ -573,18 +570,18 @@ msgstr "" msgid "Formats" msgstr "" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 #, fuzzy msgid "Export" msgstr "Export" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Uložiť" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "" @@ -637,50 +634,50 @@ msgstr "" msgid "Save font" msgstr "" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr ""  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left" msgstr "" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right" msgstr "" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "" @@ -692,10 +689,6 @@ msgstr "" msgid "Guides" msgstr "" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr "Priblížiť"@@ -724,51 +717,45 @@ msgstr "Súbor-BF" msgid "SVG-FILES ..." msgstr "Súbor-SVG" -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "neexistuje." -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "Bude vytvorené nové písmo" -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "Import bol neúspešný" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "Ruší sa" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "nie je správny názov znaku alebo Unicode zápisu" -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "Unicode zápis musí začínať na U+." -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "Pridávam" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 #, fuzzy msgid "to" msgstr "do" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "Znak" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 #, fuzzy msgid "Kerning" msgstr "Veľkosť medzery za znakom:"@@ -787,16 +774,16 @@ msgstr "" "Zadajte “space” pre upravenie kerningu medzery a “divis” pre upravenie " "kerningu -." -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Zavrieť" @@ -808,16 +795,16 @@ msgstr "Dvojice kerningu" msgid "No kerning pairs created." msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "Trieda kerningu" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Nastaviť" @@ -829,51 +816,56 @@ msgstr "" msgid "Kerning Tools" msgstr "" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "Vytvoriť novú triedu kerningu." -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "" -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "" -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "" -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions" msgstr "" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "" @@ -881,11 +873,7 @@ msgstr "" msgid "Character Set" msgstr "" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer" msgstr "" @@ -927,23 +915,23 @@ msgid "Contextual Substitutions" msgstr ""  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "Ligatúry" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "Ligatúra" @@ -971,7 +959,7 @@ msgstr "" msgid "You need an older version of Birdfont to open it." msgstr "" -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Poradie znakov" @@ -985,7 +973,7 @@ msgstr "Súbor" msgid "New" msgstr "Nový" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 #, fuzzy msgid "Recent Files" msgstr "Nedávne súbory"@@ -1036,8 +1024,8 @@ msgstr "" msgid "Move To Baseline" msgstr "" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 #, fuzzy msgid "Search" msgstr "Hľadať"@@ -1116,109 +1104,101 @@ msgstr "Exportovať písma" msgid "Export Glyph as SVG" msgstr "Exportovať znaky ako SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 #, fuzzy msgid "Import Background Image" msgstr "Vybrať obrázok pozadia" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "Náhľad" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 #, fuzzy msgid "Tab" msgstr "Karta" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 msgid "Next Tab" msgstr "" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 msgid "Previous Tab" msgstr "" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 msgid "Close Tab" msgstr "" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs" msgstr "" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 #, fuzzy msgid "Add Ligature" msgstr "Nová ligatúra" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr ""@@ -1252,7 +1232,11 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+msgid "Can't create TTF font."+msgstr ""++#: libbirdfont/MenuTab.vala:702 #, fuzzy msgid "Add ligature" msgstr "Nová ligatúra"@@ -1261,27 +1245,31 @@ msgstr "Nová ligatúra" msgid "Move paths" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "" @@ -1301,11 +1289,15 @@ msgstr "" msgid "Swashes" msgstr "" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr ""++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "" @@ -1326,43 +1318,44 @@ msgstr "Zrušiť" msgid "Yes, don't ask again." msgstr "Áno, túto otázku už viac nezobrazovať." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "" @@ -1378,7 +1371,7 @@ msgstr "" msgid "Add new points" msgstr "Pridať nové body" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "Posunúť kontrolné body" @@ -1394,20 +1387,20 @@ msgstr "Exportovať písma" msgid "Generate html document" msgstr "Vytvoriť HTML súbor" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 #, fuzzy msgid "Glyphs" msgstr "Znak" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 msgid "Backups" msgstr "" @@ -1432,44 +1425,49 @@ msgstr "" msgid "Save?" msgstr "Uložiť" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "" -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "používať TTF jednotky" -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 #, fuzzy msgid "Path simplification threshold" msgstr "Hodnota prahu zjednodušenia" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "Neprekladať"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "" @@ -1481,287 +1479,291 @@ msgstr "" msgid "Left" msgstr "" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr ""++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "" @@ -1769,7 +1771,7 @@ msgstr "" msgid "Color" msgstr "" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "" @@ -1781,7 +1783,7 @@ msgstr "" msgid "New version" msgstr "Nová verzia" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "Vaše písma boli exportované" diff --git a/po/sr.po b/po/sr.poindex c662ca7..fb5a660 100644--- a/po/sr.po+++ b/po/sr.po@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n" "PO-Revision-Date: 2015-05-06 15:40+0000\n" "Last-Translator: Ђорђе <djordje.vasiljevich@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n"@@ -85,11 +85,16 @@ msgstr "" msgid "Background Image" msgstr "" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr ""++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "" @@ -98,7 +103,7 @@ msgid "Images" msgstr ""  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "" @@ -106,16 +111,16 @@ msgstr "" msgid "Parts" msgstr "" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr ""@@ -132,10 +137,6 @@ msgstr "" msgid "corner" msgstr "" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr ""- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr ""@@ -189,18 +190,18 @@ msgid "Thai" msgstr ""  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr ""  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr ""  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description" msgstr "" @@ -209,7 +210,7 @@ msgid "PostScript Name" msgstr ""  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "" @@ -237,9 +238,9 @@ msgstr "" msgid "Unique Identifier" msgstr "" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "" @@ -311,7 +312,7 @@ msgstr "" msgid "Geometrical Shapes" msgstr "" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "" @@ -323,12 +324,16 @@ msgstr "" msgid "Grid Size" msgstr "" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -347,197 +352,192 @@ msgstr "" msgid "Insert new points on path" msgstr "" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "" -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path" msgstr "" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 msgid "Move to path to the bottom of the layer" msgstr "" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines" msgstr "" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr ""  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "" @@ -549,7 +549,7 @@ msgstr "" msgid "Units Per Em" msgstr "" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "" @@ -557,17 +557,17 @@ msgstr "" msgid "Formats" msgstr "" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "" @@ -617,50 +617,50 @@ msgstr "" msgid "Save font" msgstr "" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr ""  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left" msgstr "" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right" msgstr "" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "" @@ -672,10 +672,6 @@ msgstr "" msgid "Guides" msgstr "" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr ""@@ -704,50 +700,44 @@ msgstr "" msgid "SVG-FILES ..." msgstr "" -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "" -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "" -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "Prekidam..." -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "" -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "" -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "" @@ -763,16 +753,16 @@ msgstr "" msgid "Type “space” to kern the space character and “divis” to kern -." msgstr "" -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "" @@ -784,16 +774,16 @@ msgstr "" msgid "No kerning pairs created." msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "" @@ -805,51 +795,56 @@ msgstr "" msgid "Kerning Tools" msgstr "" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "" -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "" -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "" -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "" -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions" msgstr "" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "" @@ -857,11 +852,7 @@ msgstr "" msgid "Character Set" msgstr "" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer" msgstr "" @@ -902,23 +893,23 @@ msgid "Contextual Substitutions" msgstr ""  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "" @@ -946,7 +937,7 @@ msgstr "" msgid "You need an older version of Birdfont to open it." msgstr "" -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "" @@ -958,7 +949,7 @@ msgstr "" msgid "New" msgstr "" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files" msgstr "" @@ -1006,8 +997,8 @@ msgstr "" msgid "Move To Baseline" msgstr "" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "" @@ -1079,106 +1070,98 @@ msgstr "" msgid "Export Glyph as SVG" msgstr "" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 msgid "Tab" msgstr "" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 msgid "Next Tab" msgstr "" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 msgid "Previous Tab" msgstr "" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 msgid "Close Tab" msgstr "" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs" msgstr "" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr ""@@ -1212,7 +1195,11 @@ msgstr "" msgid "Menu" msgstr "" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+msgid "Can't create TTF font."+msgstr ""++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "" @@ -1220,27 +1207,31 @@ msgstr "" msgid "Move paths" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "" @@ -1260,11 +1251,15 @@ msgstr "" msgid "Swashes" msgstr "" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr ""++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "" @@ -1285,43 +1280,44 @@ msgstr "" msgid "Yes, don't ask again." msgstr "" -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "" @@ -1337,7 +1333,7 @@ msgstr "" msgid "Add new points" msgstr "" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "" @@ -1353,19 +1349,19 @@ msgstr "" msgid "Generate html document" msgstr "" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 msgid "Glyphs" msgstr "" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 msgid "Backups" msgstr "" @@ -1389,43 +1385,48 @@ msgstr "" msgid "Save?" msgstr "" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "" -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "" -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "Не преводи"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "" @@ -1437,287 +1438,291 @@ msgstr "" msgid "Left" msgstr "" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr ""++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "" @@ -1725,7 +1730,7 @@ msgstr "" msgid "Color" msgstr "" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "" @@ -1737,7 +1742,7 @@ msgstr "" msgid "New version" msgstr "" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "" diff --git a/po/sv.po b/po/sv.poindex 03bd98e..3488343 100644--- a/po/sv.po+++ b/po/sv.po@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n" "PO-Revision-Date: 2015-12-22 19:35+0000\n" "Last-Translator: Johan <johan.mattsson.m@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n"@@ -84,11 +84,16 @@ msgstr "Välj bakgrund" msgid "Background Image" msgstr "Bakgrundsbild" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Flytta, ändra storlek på och rotera bakgrundsbilden" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr "på axel"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Välj bakgrundsbild" @@ -97,7 +102,7 @@ msgid "Images" msgstr "Bilder"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Filer" @@ -105,16 +110,16 @@ msgstr "Filer" msgid "Parts" msgstr "Delar" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Lägg till" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "Välj tecken" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Öppna"@@ -131,10 +136,6 @@ msgstr "linje" msgid "corner" msgstr "hörn" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr "på axel"- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "Cirkel"@@ -188,18 +189,18 @@ msgid "Thai" msgstr "Thailändska"  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "a b c d e f g h i j k l m n o p q r s t u v w x y z å ä ö"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö"  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description" msgstr "Namn och beskrivning" @@ -208,7 +209,7 @@ msgid "PostScript Name" msgstr "PostScript namn"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Namn" @@ -236,9 +237,9 @@ msgstr "Hela namnet (namn och stil)" msgid "Unique Identifier" msgstr "Unik identifikation" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Version" @@ -310,7 +311,7 @@ msgstr "Streck" msgid "Geometrical Shapes" msgstr "Geometriska former" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "Zoom" @@ -322,12 +323,16 @@ msgstr "Stödlinjer & rutnät" msgid "Grid Size" msgstr "Storlek på rutnätet" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "Flytta ritytan" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -346,197 +351,192 @@ msgstr "Ångra" msgid "Insert new points on path" msgstr "Lägg till nya punkter på en slinga" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "Skapa kvadratiska Bézier slingor" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "Skapa kubiska Bézier slingor" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "Kvadratisk slinga med två linjehandtag" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Konvertera markerade punkter" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "X-koordinat" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "Y-koordinat" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "Rotation" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "Bredd" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "Höjd" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Knyt handtagen för den markerade kontrollpunkten" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "Symmetriska handtag" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Konvertera segmentet till linje." -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Skapa insida från kontur" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "Skala objekt till typsnittets topp/baslinje" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path" msgstr "Stäng slinga" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 msgid "Move to path to the bottom of the layer" msgstr "Flytta slingan till botten av lagret" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Vänd slingan vertikalt" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Vänd slingan horisontellt" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "Ställ in storleken på bakgrundsbilden" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "Visa/dölj bakgrundsbilden" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Lägg till en ny bakgrundsbild" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "Hög kontrast" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "Ställ in tröskelvärde för bakgrundsbilden" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "Mängden genererade detaljer i autotrace" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "Förenkling av genererade slingor" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "Automatisk konvertering från bakgrundsbild till vektorgrafik" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "Radera bakgrundsbild" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "Lägg till lager" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "Visa lager" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "Använd sträck" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Linjebredd" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "Skapa kantlinje från streck" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "Rak linjeavslutning" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "Rund linjeavslutning" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "Kvadratisk linjeavslutning" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Visa stödlinjer" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines" msgstr "Visa fler stödlinjer" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "Visa stödlinjer för botten- och toppmarginaler" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "Lås stödlinjer och rutnät" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "Zooma ut ytterligare" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "Visa hela" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "Anpassa till vy" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "Visa hela bakgrundsbilden" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "Föregående vy" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Nästa vy" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Ställ in storleken på rutmönstret"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "Exportinställningar" @@ -548,7 +548,7 @@ msgstr "Filnamn" msgid "Units Per Em" msgstr "Enheter per em" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "Katalog" @@ -556,17 +556,17 @@ msgstr "Katalog" msgid "Formats" msgstr "Format" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "Exportera" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Spara" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "Alfabetet" @@ -615,50 +615,50 @@ msgstr "Öppna ett typsnitt" msgid "Save font" msgstr "Spara typsnitt" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr "Inställningar"  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "Temata" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "övre marginal" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "överkant" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "x-höjd" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "baslinje" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "nederkant" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "undre marginal" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left" msgstr "vänster" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right" msgstr "höger" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "Hjälplinje" @@ -670,10 +670,6 @@ msgstr "Visa rutnät" msgid "Guides" msgstr "Hjälplinjer" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr "Zooma in"@@ -702,50 +698,44 @@ msgstr "BF-FIL" msgid "SVG-FILES ..." msgstr "SVG-FILER ..." -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "finns inte." -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "En ny font kommer att skapas." -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "Misslyckades med att importera" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "Avbryter" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "är inte namnet på ett tecken eller ett Unicode värde." -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "Unicode värden måste börja med U+." -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "Lägger till" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "till" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "Tecken" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Kerning" @@ -765,16 +755,16 @@ msgstr "" "Skriv ”space” för att justera avståndet mot mellanslag och ”divis” för att " "justera avståndet mot -." -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "Unicode" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "Infoga" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Stäng" @@ -786,16 +776,16 @@ msgstr "Kerning par" msgid "No kerning pairs created." msgstr "Inga kerningpar är skapade." -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "Kerning klass" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Lägg till" @@ -807,51 +797,56 @@ msgstr "Ladda kerning strängar" msgid "Kerning Tools" msgstr "Kerning" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "Teckenstorlek" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "Skapa en ny kerning klass." -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "Använd täxtfältet för att lägga till kerning värden." -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "Lägg till tecken från översiktsvyn" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "Lägg till ett unicodetecken för ett unicodevärde" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "Öppna en text fil med kerning strängar först." -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "Föregående kerning sträng" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "Du har nått början av listan." -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "Nästa kerning sträng" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "Du har nått slutet av listan." -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions" msgstr "Ersättningar" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 msgid "Character Sets" msgstr "Teckenuppsättning" @@ -859,11 +854,7 @@ msgstr "Teckenuppsättning" msgid "Character Set" msgstr "Teckenuppsättning" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer" msgstr "Lager" @@ -904,23 +895,23 @@ msgid "Contextual Substitutions" msgstr "Kontextuell ligatur"  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "Ligaturer" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "Början" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "Mitten" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "Slut" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "Ligatur" @@ -948,7 +939,7 @@ msgstr "Det här typsnittet skapades med en gammal version av Birdfont." msgid "You need an older version of Birdfont to open it." msgstr "Du behöver en äldre version av Birdfont för att öppna det." -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Teckensekvens" @@ -960,7 +951,7 @@ msgstr "Arkiv" msgid "New" msgstr "Ny" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 msgid "Recent Files" msgstr "Senast använda filer" @@ -1008,8 +999,8 @@ msgstr "Markera alla tecken" msgid "Move To Baseline" msgstr "Flytta till baslinjen" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "Sök" @@ -1081,106 +1072,98 @@ msgstr "Exportera fonter" msgid "Export Glyph as SVG" msgstr "Exportera tecken som SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "Infoga en SVG fil" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "Infoga en SVG mapp" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr "färg"--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "Infoga en bakgrundsbild" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "Förhandsgranska" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 msgid "Tab" msgstr "Flik" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 msgid "Next Tab" msgstr "Nästa flik" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 msgid "Previous Tab" msgstr "Föregående flik" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 msgid "Close Tab" msgstr "Stäng flik" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs" msgstr "Stäng alla flikar" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "Teckenavstånd och Kerning" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "Visa teckenavstånd" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "Visa kerningflik" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "Lista alla kerningpar" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "Mellanrumsklasser" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "Välj nästa kerningpar" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "Välj föregående kerningpar" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "Ladda kerning strängar" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "Läs in kerning strängarna igen" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "Visa ligaturer" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "Lägg till ligatur" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "Git" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "Spara som .bfp" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Översikt" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr "UPP"@@ -1214,7 +1197,12 @@ msgstr "Du måste spara ditt typsnitt innan du exporterar det." msgid "Menu" msgstr "Meny" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+#, fuzzy+msgid "Can't create TTF font."+msgstr "Skapa ett nytt typsnitt"++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "Lägg till ligatur" @@ -1222,27 +1210,31 @@ msgstr "Lägg till ligatur" msgid "Move paths" msgstr "Flytta objekt" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "Teckenersättning" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "Nytt tecken" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "Ersättning" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "Tagg" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "Teckennamn" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "Alla tecken måste ha unika namn." @@ -1262,11 +1254,15 @@ msgstr "Versaler till kapitäler" msgid "Swashes" msgstr "Swashes" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "Filtrera" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr "Inga tecken att visa."++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "Se även:" @@ -1287,43 +1283,44 @@ msgstr "Avbryt" msgid "Yes, don't ask again." msgstr "Ja, fråga inte igen." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "Transformera" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "Multi-Master" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "Alla tecken" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "Standard" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "Snedställ" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "Ändra storlek" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "Skapa ett alternativt tecken" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "Ställ in riktning för slingorna" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "Storlek för master" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "Skapa en ny masterfont" @@ -1339,7 +1336,7 @@ msgstr "Ersätt" msgid "Add new points" msgstr "Lägg till nya punkter" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "Flytta kontrollpunkter" @@ -1355,19 +1352,19 @@ msgstr "Exportera fonter" msgid "Generate html document" msgstr "Skapa html dokument" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "Inga typsnitt är skapade än" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "Skapa ett nytt typsnitt" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 msgid "Glyphs" msgstr "Tecken" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 msgid "Backups" msgstr "Säkerhetskopior" @@ -1391,43 +1388,48 @@ msgstr "Spara inte" msgid "Save?" msgstr "Spara?" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "Precision för ritverktyget" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "Visa eller dölj kontrollpunkternas handtag" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "Fyll öppna slingor." -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "Använd TTF enheter." -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "Antal punkter som läggs till av frihandsverktyget" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "Tröskel värde för förenkling av slingor" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "översätt inte"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "Färgtema" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "Snabbtangenter" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "Tecken" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "Ny mellanrumsklass" @@ -1439,287 +1441,291 @@ msgstr "Teckenavstånd" msgid "Left" msgstr "Vänster" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "Höger" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "Importera"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "Dukbakgrund" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "Fyllning för streck" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "Linjefärg" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "Handtagsfärg" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "Fyllnadsfärg" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "Markerade objekt" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "Bakgrund 1" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "Dialogbakgrund" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "Menybakgrund" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "Standardbakgrund" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "Kryssrutornas bakgrund" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "Förgrund 1" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "Textens förgrundsfärg" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "Tabellkant" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "Markeringsram" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "Översiktstecken" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "Förgrund inverterad" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "Menyns förgrundsfärg" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "Förgrund för markerat flik" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "Flikavskiljare" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "Markerad 1" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "Markerad stödlinje" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "Rutnät" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "Södlinje 1" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "Stödlinje 2" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "Stödlinje 3" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "Knappens ram 1" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "Knappend bakgrund 1" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "Knappens ram 2" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "Knappens bakgrund 2" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "Knappens ram 3" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "Knappens bakgrund 3" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "Knappens ram 4" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "Knappens bakgrund 4" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "Knappens förgrund" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "Förgrundsfärg för nedtryckt knapp" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "Verktygsförgrund" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "Förgrund för markerat verktyg" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "Textrutans bakgrund" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "Ram för översiktsobjekt" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "Markerat objekt i översiktsvyn" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "Objekt i översiktsvyn 1" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "Objekt i översiktsvyn 2" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "Översikt, markerad förgrund" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "Förgrundsfärg i översiktsvyn" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "Backgrundsfärg för teckenräknaren 1" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "Backgrundsfärg för teckenräknaren 2" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "Dialogskugga" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "Markerat och aktiv kubisk kontrollpunkt" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "Markerad kubisk kontrollpunkt" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "Aktiv kubisk kontrollpunkt" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "Kubisk kontrollpunkt" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "Aktiv markerad kvadratisk kontrollpunkt" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "Markerad kvadratisk kontrollpunkt" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "Aktiv kvadratisk kontrollpunkt" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "Kubisk kontrollpunkt" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "Markerat handtag för en kontrollpunkt" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "Aktivt handtag" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "Handtag för en kontrollpunkt" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "Sammanfoga" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "Rotationsknapp" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "Aktiv rotationsknapp" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "Zoomverktygets ram" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "Typsnittsnamn" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "Nytt tema" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "Lägg till nytt tema" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "Färger" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "Mörk" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "Ljus" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "Anpassad" @@ -1727,7 +1733,7 @@ msgstr "Anpassad" msgid "Color" msgstr "Färg" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "Skift" @@ -1739,7 +1745,7 @@ msgstr "Rita på fri hand" msgid "New version" msgstr "Ny version" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "Dina fonter har exporterats." @@ -1771,11 +1777,8 @@ msgstr "Okänt filformat." msgid "Writing" msgstr "Skriver" -#~ msgid "No glyphs in this view."-#~ msgstr "Inga tecken att visa."--#~ msgid "Import"-#~ msgstr "Importera"+#~ msgid "color"+#~ msgstr "färg"  #~ msgid "Manufakturer" #~ msgstr "Tillverkare"@@ -2259,9 +2262,6 @@ msgstr "Skriver" #~ msgid "Update name & description" #~ msgstr "Uppdatera namn & beskrivning" -#~ msgid "Create a new font"-#~ msgstr "Skapa ett nytt typsnitt"- #~ msgid "Add name and description to this font." #~ msgstr "Lägg till namn och beskrivning för det här typsnittet." diff --git a/po/tr.po b/po/tr.poindex 3cc26d3..bc1295b 100644--- a/po/tr.po+++ b/po/tr.po@@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"-"PO-Revision-Date: 2015-12-19 09:15+0000\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n"+"PO-Revision-Date: 2017-06-11 11:33+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: tr\n"@@ -16,16 +16,16 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.5.1-rc1\n"-"X-POOTLE-MTIME: 1450516550.000000\n"+"X-POOTLE-MTIME: 1497180838.000000\n"  #: libbirdfont/Argument.vala:277 msgid "Usage"-msgstr "Kullanımı"+msgstr "haber"  #: libbirdfont/Argument.vala:279 libbirdfont/ExportUtils.vala:19 #: birdfont-autotrace/AutoTrace.vala:68 msgid "FILE"-msgstr "DOSYA"+msgstr "haber"  #: libbirdfont/Argument.vala:279 libbirdfont/ExportUtils.vala:19 #: birdfont-autotrace/AutoTrace.vala:68@@ -88,11 +88,16 @@ msgstr "Arkaplan Seç" msgid "Background Image" msgstr "Arkaplan Resmi" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Arkaplan görselini taşı, ölçeklendir ve çevir" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr "eksen üzerinde"++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Arkaplan görselini seç" @@ -101,7 +106,7 @@ msgid "Images" msgstr "Resimler"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Dosyalar" @@ -109,16 +114,16 @@ msgstr "Dosyalar" msgid "Parts" msgstr "Bölümler" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "Ekle" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "Glyph Seç" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Aç"@@ -136,10 +141,6 @@ msgstr "çizgi" msgid "corner" msgstr "köşe" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr "eksen üzerinde"- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "Çember"@@ -194,18 +195,18 @@ msgid "Thai" msgstr "Tay Dili"  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr ""  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr ""  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 msgid "Name and Description" msgstr "ad ve açıklama" @@ -214,7 +215,7 @@ msgid "PostScript Name" msgstr "PostScript dosyası"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "İsim" @@ -243,9 +244,9 @@ msgstr "Ad ve soyad" msgid "Unique Identifier" msgstr "Özgün Tanımlayıcı" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Sürüm" @@ -318,7 +319,7 @@ msgstr "Darbe:" msgid "Geometrical Shapes" msgstr "Geometrik Şekiller" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 msgid "Zoom" msgstr "yakınlaştırma, odaklama veya uzaklasma" @@ -330,12 +331,16 @@ msgstr "" msgid "Grid Size" msgstr "Izgara boyutu" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "Cizim alanini taşı" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -354,199 +359,194 @@ msgstr "Geri al" msgid "Insert new points on path" msgstr "Yeni nokta ve cizgi (yol) ekle" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "2. derece Bezier eğrisi oluştur" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "Kübik Bezier eğrisi oluştur" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 #, fuzzy msgid "Quadratic path with two line handles" msgstr "4 kenarli bir yol ve iki tutaç" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Seçili noktaları dönüştür" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "X koordinatı" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "Y koordinatı" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "Döndürme" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "Genişlik" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "Yükseklik" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Bir kismi, parçayi çizgi dönüştür" -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 msgid "Close path" msgstr "" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 msgid "Move to path to the bottom of the layer" msgstr "" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Dikey yönde çevir" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Yatay yönde çevir" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "Koyu kontrast (karşıtlık)" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "arkaplan ayar limiti" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "otomatik izleme miktari" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "otomatik izleme basitlestirmesi" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 #, fuzzy msgid "Delete background image" msgstr "Arkaplan Resmi Seç" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "vuruş, çarpma uygula" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Çizgi kalınlığı" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 msgid "Show more guidelines" msgstr "" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "Önceki görünüm" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Sonraki görünüm" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr ""  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "" @@ -558,7 +558,7 @@ msgstr "" msgid "Units Per Em" msgstr "" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "" @@ -566,17 +566,17 @@ msgstr "" msgid "Formats" msgstr "" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 msgid "Export" msgstr "" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Kaydet" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "" @@ -629,50 +629,50 @@ msgstr "" msgid "Save font" msgstr "" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr ""  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left" msgstr "" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right" msgstr "" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "" @@ -684,10 +684,6 @@ msgstr "Izgarayı göster" msgid "Guides" msgstr "" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 msgid "Zoom in" msgstr "Yakınlaştır"@@ -716,50 +712,44 @@ msgstr "" msgid "SVG-FILES ..." msgstr "" -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "mevcut değil" -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "Yeni bir yazı tipi oluşturulacak." -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "İçe aktarma başarısız" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "İptal ediliyor" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "glyph veya Unicode ismi ile ayni degil, uyusmuyor" -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "kod (program) değerleri U+ ile başlar" -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "Ekleniyor" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "için" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "sembol" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Harf aralığı (Kerning)" @@ -775,16 +765,16 @@ msgstr "" msgid "Type “space” to kern the space character and “divis” to kern -." msgstr "" -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "" @@ -796,16 +786,16 @@ msgstr "" msgid "No kerning pairs created." msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "" @@ -817,51 +807,56 @@ msgstr "" msgid "Kerning Tools" msgstr "" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 msgid "Font Size" msgstr "" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "" -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "" -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "" -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "" -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions" msgstr "" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 #, fuzzy msgid "Character Sets" msgstr "Karakter seti"@@ -870,11 +865,7 @@ msgstr "Karakter seti" msgid "Character Set" msgstr "Karakter seti" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer" msgstr "" @@ -915,23 +906,23 @@ msgid "Contextual Substitutions" msgstr ""  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "" @@ -959,7 +950,7 @@ msgstr "" msgid "You need an older version of Birdfont to open it." msgstr "" -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "" @@ -972,7 +963,7 @@ msgstr "Dosyalar" msgid "New" msgstr "" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 #, fuzzy msgid "Recent Files" msgstr "Son dosyalar"@@ -1021,8 +1012,8 @@ msgstr "" msgid "Move To Baseline" msgstr "" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "Ara" @@ -1094,107 +1085,99 @@ msgstr "" msgid "Export Glyph as SVG" msgstr "" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 #, fuzzy msgid "Import Background Image" msgstr "Arkaplan Resmi Seç" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "Önizleme" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 msgid "Tab" msgstr "" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 msgid "Next Tab" msgstr "" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 msgid "Previous Tab" msgstr "" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 msgid "Close Tab" msgstr "" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 msgid "Close All Tabs" msgstr "" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 msgid "Show Spacing Tab" msgstr "" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 msgid "Show Kerning Tab" msgstr "" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Gözden Geçirme" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr ""@@ -1228,7 +1211,12 @@ msgstr "" msgid "Menu" msgstr "Menü" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+#, fuzzy+msgid "Can't create TTF font."+msgstr "Yeni bir yazı tipi oluştur"++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "" @@ -1236,27 +1224,31 @@ msgstr "" msgid "Move paths" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "" @@ -1276,11 +1268,15 @@ msgstr "" msgid "Swashes" msgstr "" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "Filtre" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr ""++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "Ayrıca bakınız:" @@ -1301,43 +1297,44 @@ msgstr "İptal" msgid "Yes, don't ask again." msgstr "Evet, tekrar sorma." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "Eğ" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "" @@ -1353,7 +1350,7 @@ msgstr "" msgid "Add new points" msgstr "Yeni nokta ekle" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "Kontrol noktası taşı" @@ -1369,20 +1366,20 @@ msgstr "" msgid "Generate html document" msgstr "" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 #, fuzzy msgid "Glyphs" msgstr "sembol" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 #, fuzzy msgid "Backups" msgstr "Yedekleme"@@ -1408,43 +1405,48 @@ msgstr "" msgid "Save?" msgstr "Kaydet" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "" -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "" -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "tercüme etme"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "" @@ -1456,287 +1458,291 @@ msgstr "" msgid "Left" msgstr "" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "İçe Aktar"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 msgid "Stroke Color" msgstr "" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 msgid "Handle Color" msgstr "" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "" @@ -1744,7 +1750,7 @@ msgstr "" msgid "Color" msgstr "" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "" @@ -1756,7 +1762,7 @@ msgstr "" msgid "New version" msgstr "" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "" @@ -1789,9 +1795,6 @@ msgstr "" msgid "Writing" msgstr "Yazılıyor" -#~ msgid "Import"-#~ msgstr "İçe Aktar"- #, fuzzy #~ msgid "Full name (name and style)" #~ msgstr "Ad ve soyad"@@ -1881,9 +1884,6 @@ msgstr "Yazılıyor" #~ msgid "Update name & description" #~ msgstr "İsim & açıklamayı güncelle" -#~ msgid "Create a new font"-#~ msgstr "Yeni bir yazı tipi oluştur"- #~ msgid "Preferences" #~ msgstr "Tercihler" diff --git a/po/uk.po b/po/uk.poindex 2730500..ea4bba0 100644--- a/po/uk.po+++ b/po/uk.po@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2016-01-06 12:06+0100\n"+"POT-Creation-Date: 2017-06-14 17:09+0200\n" "PO-Revision-Date: 2015-06-04 10:54+0000\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE <LL@li.org>\n"@@ -90,11 +90,16 @@ msgstr "" msgid "Background Image" msgstr "Фонове зображення" -#: libbirdfont/BackgroundTool.vala:44+#: libbirdfont/BackgroundTool.vala:163 msgid "Move, resize and rotate background image" msgstr "Переміщення, зміна розміру і поворот фонового зображення" -#: libbirdfont/BackgroundTool.vala:246+#: libbirdfont/BackgroundTool.vala:166 libbirdfont/BezierTool.vala:103+#: libbirdfont/PointTool.vala:88+msgid "on axis"+msgstr ""++#: libbirdfont/BackgroundTool.vala:294 msgid "Select background image" msgstr "Вибір фонового зображення" @@ -103,7 +108,7 @@ msgid "Images" msgstr "Зображення"  #: libbirdfont/BackgroundTools.vala:34 libbirdfont/FileDialogTab.vala:94-#: libbirdfont/RecentFiles.vala:106+#: libbirdfont/RecentFiles.vala:110 msgid "Files" msgstr "Файли" @@ -111,16 +116,16 @@ msgstr "Файли" msgid "Parts" msgstr "" -#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2462-#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/BackgroundTools.vala:53 libbirdfont/Glyph.vala:2362+#: libbirdfont/LigatureList.vala:106 libbirdfont/OtfFeatureTable.vala:218 msgid "Add" msgstr "" -#: libbirdfont/BackgroundTools.vala:123+#: libbirdfont/BackgroundTools.vala:122 msgid "Select Glyph" msgstr "" -#: libbirdfont/BackgroundTools.vala:233 libbirdfont/LoadCallback.vala:102+#: libbirdfont/BackgroundTools.vala:232 libbirdfont/LoadCallback.vala:100 #: libbirdfont/Menu.vala:50 msgid "Open" msgstr "Відкрити"@@ -137,10 +142,6 @@ msgstr "" msgid "corner" msgstr "" -#: libbirdfont/BezierTool.vala:103-msgid "on axis"-msgstr ""- #: libbirdfont/CircleTool.vala:36 msgid "Circle" msgstr "Коло"@@ -196,14 +197,14 @@ msgid "Thai" msgstr ""  #. / All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:433+#: libbirdfont/DefaultCharactersSet.vala:118 libbirdfont/ExportTool.vala:440 msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z" msgstr "" "а, б, в, г, ґ, д, е, є, ж, з, и, і, ї, й, к, л, м, н, о, п, р, с, т, у, ф, " "х, ц, ч, ш, щ, ь, ю, я"  #. / All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included.-#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:434+#: libbirdfont/DefaultCharactersSet.vala:121 libbirdfont/ExportTool.vala:441 msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z" msgstr "" "А, Б, В, Г, Ґ, Д, Е, Є, Ж, З, И, І, Ї, Й, К, Л, М, Н, О, П, Р, С, Т, У, Ф, "@@ -211,7 +212,7 @@ msgstr ""  #: libbirdfont/DescriptionDisplay.vala:66 #: libbirdfont/DescriptionDisplay.vala:277 libbirdfont/ExportSettings.vala:133-#: libbirdfont/Menu.vala:499 libbirdfont/TableLayout.vala:203+#: libbirdfont/Menu.vala:489 libbirdfont/TableLayout.vala:203 #, fuzzy msgid "Name and Description" msgstr "Ім'я та _Опис"@@ -222,7 +223,7 @@ msgid "PostScript Name" msgstr "Postscript ім'я"  #: libbirdfont/DescriptionDisplay.vala:80 libbirdfont/MenuTab.vala:103-#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:702 msgid "Name" msgstr "Назва" @@ -252,9 +253,9 @@ msgstr "Повне ім'я" msgid "Unique Identifier" msgstr "Унікальний ідентифікатор" -#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:161-#: libbirdfont/Menu.vala:506 libbirdfont/Menu.vala:508-#: libbirdfont/VersionList.vala:265+#: libbirdfont/DescriptionDisplay.vala:150 libbirdfont/ImportUtils.vala:156+#: libbirdfont/Menu.vala:496 libbirdfont/Menu.vala:498+#: libbirdfont/VersionList.vala:268 msgid "Version" msgstr "Версія" @@ -327,7 +328,7 @@ msgstr "" msgid "Geometrical Shapes" msgstr "" -#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:40+#: libbirdfont/DrawingTools.vala:129 libbirdfont/OverviewTools.vala:45 #, fuzzy msgid "Zoom" msgstr "_Наближення/Віддалення"@@ -340,12 +341,16 @@ msgstr "" msgid "Grid Size" msgstr "" -#: libbirdfont/DrawingTools.vala:195+#: libbirdfont/DrawingTools.vala:194 msgid "Move canvas" msgstr "" +#: libbirdfont/DrawingTools.vala:195+msgid "Ctrl + Shift + Click"+msgstr ""+ #: libbirdfont/DrawingTools.vala:196-msgid "Press space and click to move the canvas."+msgid "Space + Click" msgstr ""  #: libbirdfont/DrawingTools.vala:204@@ -365,199 +370,194 @@ msgstr "_Відмінити" msgid "Insert new points on path" msgstr "" -#: libbirdfont/DrawingTools.vala:244+#: libbirdfont/DrawingTools.vala:243 msgid "Create quadratic Bézier curves" msgstr "Створити квадратну криву Безьє" -#: libbirdfont/DrawingTools.vala:245-msgid ""-"All control points will be converted to quadratic points in the TTF format."-msgstr ""--#: libbirdfont/DrawingTools.vala:255+#: libbirdfont/DrawingTools.vala:252 msgid "Create cubic Bézier curves" msgstr "Створити кубічну криву Безьє" -#: libbirdfont/DrawingTools.vala:264+#: libbirdfont/DrawingTools.vala:261 msgid "Quadratic path with two line handles" msgstr "Квадратичний шлях з двома лінійними держаками" -#: libbirdfont/DrawingTools.vala:273+#: libbirdfont/DrawingTools.vala:270 msgid "Convert selected points" msgstr "Перетворити вибрані точки" -#: libbirdfont/DrawingTools.vala:284+#: libbirdfont/DrawingTools.vala:281 msgid "X coordinate" msgstr "" -#: libbirdfont/DrawingTools.vala:328+#: libbirdfont/DrawingTools.vala:325 msgid "Y coordinate" msgstr "" -#: libbirdfont/DrawingTools.vala:371+#: libbirdfont/DrawingTools.vala:368 msgid "Rotation" msgstr "" -#: libbirdfont/DrawingTools.vala:410+#: libbirdfont/DrawingTools.vala:407 msgid "Width" msgstr "" -#: libbirdfont/DrawingTools.vala:435+#: libbirdfont/DrawingTools.vala:432 msgid "Height" msgstr "" -#: libbirdfont/DrawingTools.vala:478+#: libbirdfont/DrawingTools.vala:475 msgid "Tie curve handles for the selected edit point" msgstr "Круглові держаки кривої для виділеної точки правки" -#: libbirdfont/DrawingTools.vala:529+#: libbirdfont/DrawingTools.vala:526 msgid "Symmetrical handles" msgstr "Симетричні держаки" -#: libbirdfont/DrawingTools.vala:559+#: libbirdfont/DrawingTools.vala:556 msgid "Convert segment to line." msgstr "Конвертувати сегмент у лінію" -#: libbirdfont/DrawingTools.vala:567+#: libbirdfont/DrawingTools.vala:564 msgid "Create counter from outline" msgstr "Створити контур з лінії" -#: libbirdfont/DrawingTools.vala:570+#: libbirdfont/DrawingTools.vala:567 msgid "Scale object to font top/baseline" msgstr "" -#: libbirdfont/DrawingTools.vala:579+#: libbirdfont/DrawingTools.vala:576 #, fuzzy msgid "Close path" msgstr "Замкнути _контур" -#: libbirdfont/DrawingTools.vala:601+#: libbirdfont/DrawingTools.vala:598 msgid "Move to path to the bottom of the layer" msgstr "" -#: libbirdfont/DrawingTools.vala:615+#: libbirdfont/DrawingTools.vala:612 msgid "Flip path vertically" msgstr "Перевернути контур вертикально" -#: libbirdfont/DrawingTools.vala:623+#: libbirdfont/DrawingTools.vala:620 msgid "Flip path horizontally" msgstr "Перевернути контур горизонтально" -#: libbirdfont/DrawingTools.vala:632+#: libbirdfont/DrawingTools.vala:629 msgid "Set size for background image" msgstr "Встановити розмір фонового зображення" -#: libbirdfont/DrawingTools.vala:670+#: libbirdfont/DrawingTools.vala:667 msgid "Show/hide background image" msgstr "Показати/сховати зображення тла" -#: libbirdfont/DrawingTools.vala:681+#: libbirdfont/DrawingTools.vala:678 msgid "Insert a new background image" msgstr "Встановити нове зображення тла" -#: libbirdfont/DrawingTools.vala:695 libbirdfont/ThemeTab.vala:151+#: libbirdfont/DrawingTools.vala:692 libbirdfont/ThemeTab.vala:156 msgid "High contrast" msgstr "" -#: libbirdfont/DrawingTools.vala:709+#: libbirdfont/DrawingTools.vala:706 msgid "Set background threshold" msgstr "" -#: libbirdfont/DrawingTools.vala:728+#: libbirdfont/DrawingTools.vala:725 msgid "Amount of autotrace details" msgstr "" -#: libbirdfont/DrawingTools.vala:747+#: libbirdfont/DrawingTools.vala:744 msgid "Autotrace simplification" msgstr "" -#: libbirdfont/DrawingTools.vala:757+#: libbirdfont/DrawingTools.vala:754 msgid "Autotrace background image" msgstr "" -#: libbirdfont/DrawingTools.vala:765+#: libbirdfont/DrawingTools.vala:762 msgid "Delete background image" msgstr "" -#: libbirdfont/DrawingTools.vala:772+#: libbirdfont/DrawingTools.vala:769 msgid "Add layer" msgstr "" -#: libbirdfont/DrawingTools.vala:782+#: libbirdfont/DrawingTools.vala:779 msgid "Show layers" msgstr "" -#: libbirdfont/DrawingTools.vala:792+#: libbirdfont/DrawingTools.vala:789 msgid "Apply stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:826 libbirdfont/SettingsTab.vala:34+#: libbirdfont/DrawingTools.vala:823 libbirdfont/SettingsTab.vala:36 msgid "Stroke width" msgstr "Товщина штриха" -#: libbirdfont/DrawingTools.vala:872+#: libbirdfont/DrawingTools.vala:865 msgid "Create outline form stroke" msgstr "" -#: libbirdfont/DrawingTools.vala:881+#: libbirdfont/DrawingTools.vala:874 msgid "Butt line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:908+#: libbirdfont/DrawingTools.vala:898 msgid "Round line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:936+#: libbirdfont/DrawingTools.vala:923 msgid "Square line cap" msgstr "" -#: libbirdfont/DrawingTools.vala:1008+#: libbirdfont/DrawingTools.vala:992 msgid "Show guidelines" msgstr "Показати орієнтири" -#: libbirdfont/DrawingTools.vala:1020+#: libbirdfont/DrawingTools.vala:1004 #, fuzzy msgid "Show more guidelines" msgstr "Показати орієнтири" -#: libbirdfont/DrawingTools.vala:1036+#: libbirdfont/DrawingTools.vala:1020 msgid "Show guidelines at top and bottom margin" msgstr "Показати орієнтири для верхньої і нижньої меж" -#: libbirdfont/DrawingTools.vala:1060+#: libbirdfont/DrawingTools.vala:1044 msgid "Lock guides and grid" msgstr "" -#: libbirdfont/DrawingTools.vala:1102+#: libbirdfont/DrawingTools.vala:1086 msgid "Zoom Out More" msgstr "" -#: libbirdfont/DrawingTools.vala:1111+#: libbirdfont/DrawingTools.vala:1096 msgid "Show full glyph" msgstr "Показати гліф повністю" -#: libbirdfont/DrawingTools.vala:1118+#: libbirdfont/DrawingTools.vala:1104 msgid "Fit in view" msgstr "" -#: libbirdfont/DrawingTools.vala:1125+#: libbirdfont/DrawingTools.vala:1112 msgid "Zoom in on background image" msgstr "Наблизити у межах фонового зображення" -#: libbirdfont/DrawingTools.vala:1135+#: libbirdfont/DrawingTools.vala:1123 msgid "Previous view" msgstr "Попередній вигляд" -#: libbirdfont/DrawingTools.vala:1141+#: libbirdfont/DrawingTools.vala:1130 msgid "Next view" msgstr "Наступний вигляд" -#: libbirdfont/DrawingTools.vala:1543+#: libbirdfont/DrawingTools.vala:1535 msgid "Set size for grid" msgstr "Установити розмір для сітки"  #: libbirdfont/ExportSettings.vala:41 libbirdfont/ExportSettings.vala:185-#: libbirdfont/Menu.vala:329+#: libbirdfont/Menu.vala:309 msgid "Export Settings" msgstr "" @@ -569,7 +569,7 @@ msgstr "" msgid "Units Per Em" msgstr "" -#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:73+#: libbirdfont/ExportSettings.vala:94 libbirdfont/RecentFiles.vala:77 msgid "Folder" msgstr "" @@ -577,18 +577,18 @@ msgstr "" msgid "Formats" msgstr "" -#: libbirdfont/ExportSettings.vala:139+#: libbirdfont/ExportSettings.vala:139 libbirdfont/ExportTool.vala:40 #, fuzzy msgid "Export" msgstr "_Експорт" -#: libbirdfont/ExportTool.vala:222 libbirdfont/Menu.vala:64-#: libbirdfont/MenuTab.vala:355 libbirdfont/SaveCallback.vala:69+#: libbirdfont/ExportTool.vala:233 libbirdfont/Menu.vala:64+#: libbirdfont/MenuTab.vala:359 libbirdfont/SaveCallback.vala:68 #: libbirdfont/SaveDialog.vala:38 libbirdfont/SaveDialogListener.vala:29 msgid "Save" msgstr "Зберегти" -#: libbirdfont/ExportTool.vala:432+#: libbirdfont/ExportTool.vala:439 msgid "Alphabet" msgstr "" @@ -642,50 +642,50 @@ msgstr "" msgid "Save font" msgstr "" -#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:492-#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:31-#: libbirdfont/SettingsTab.vala:159+#: libbirdfont/FileTools.vala:49 libbirdfont/Menu.vala:482+#: libbirdfont/SettingsDisplay.vala:225 libbirdfont/SettingsTab.vala:33+#: libbirdfont/SettingsTab.vala:180 msgid "Settings" msgstr ""  #: libbirdfont/FileTools.vala:55 libbirdfont/ThemeTab.vala:42-#: libbirdfont/ThemeTab.vala:162+#: libbirdfont/ThemeTab.vala:167 msgid "Themes" msgstr "" -#: libbirdfont/Glyph.vala:602+#: libbirdfont/Glyph.vala:518 msgid "top margin" msgstr "" -#: libbirdfont/Glyph.vala:609+#: libbirdfont/Glyph.vala:525 msgid "top" msgstr "" -#: libbirdfont/Glyph.vala:616+#: libbirdfont/Glyph.vala:532 msgid "x-height" msgstr "" -#: libbirdfont/Glyph.vala:625+#: libbirdfont/Glyph.vala:541 msgid "baseline" msgstr "" -#: libbirdfont/Glyph.vala:632+#: libbirdfont/Glyph.vala:548 msgid "bottom" msgstr "" -#: libbirdfont/Glyph.vala:638+#: libbirdfont/Glyph.vala:554 msgid "bottom margin" msgstr "" -#: libbirdfont/Glyph.vala:644+#: libbirdfont/Glyph.vala:560 msgid "left" msgstr "" -#: libbirdfont/Glyph.vala:653+#: libbirdfont/Glyph.vala:569 msgid "right" msgstr "" -#: libbirdfont/Glyph.vala:2462+#: libbirdfont/Glyph.vala:2362 msgid "Guide" msgstr "" @@ -697,10 +697,6 @@ msgstr "Показати сітку" msgid "Guides" msgstr "" -#: libbirdfont/Help.vala:29-msgid "BirdFont is a font editor."-msgstr ""- #: libbirdfont/HiddenTools.vala:33 #, fuzzy msgid "Zoom in"@@ -731,50 +727,44 @@ msgstr "" msgid "SVG-FILES ..." msgstr "" -#: libbirdfont/ImportUtils.vala:59 libbirdfont/ImportUtils.vala:67+#: libbirdfont/ImportUtils.vala:54 libbirdfont/ImportUtils.vala:62 msgid "does not exist." msgstr "" -#: libbirdfont/ImportUtils.vala:68+#: libbirdfont/ImportUtils.vala:63 msgid "A new font will be created." msgstr "" -#: libbirdfont/ImportUtils.vala:90+#: libbirdfont/ImportUtils.vala:85 msgid "Failed to import" msgstr "" -#: libbirdfont/ImportUtils.vala:91+#: libbirdfont/ImportUtils.vala:86 msgid "Aborting" msgstr "" -#: libbirdfont/ImportUtils.vala:124+#: libbirdfont/ImportUtils.vala:119 msgid "is not the name of a glyph or a Unicode value." msgstr "" -#: libbirdfont/ImportUtils.vala:125+#: libbirdfont/ImportUtils.vala:120 msgid "Unicode values must start with U+." msgstr "" -#: libbirdfont/ImportUtils.vala:151+#: libbirdfont/ImportUtils.vala:146 msgid "Adding" msgstr "" -#: libbirdfont/ImportUtils.vala:155+#: libbirdfont/ImportUtils.vala:150 msgid "to" msgstr "" -#: libbirdfont/ImportUtils.vala:157 libbirdfont/OtfFeatureTable.vala:105-#: libbirdfont/OverviewTools.vala:42+#: libbirdfont/ImportUtils.vala:152 libbirdfont/OtfFeatureTable.vala:135+#: libbirdfont/OverviewTools.vala:48 msgid "Glyph" msgstr "" -#: libbirdfont/KerningDisplay.vala:60-msgid ""-"Kerning is the process of adjusting the space between two letters. You can "-"cahnge the space between one letter and all other letters in the spacing tab."-msgstr ""--#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:882+#: libbirdfont/KerningDisplay.vala:101 libbirdfont/KerningDisplay.vala:931 msgid "Kerning" msgstr "Кернінг" @@ -791,16 +781,16 @@ msgstr "" msgid "Type “space” to kern the space character and “divis” to kern -." msgstr "Ввести “space” для керну простору символів та “divis” для керну -." -#: libbirdfont/KerningDisplay.vala:683 libbirdfont/OverviewTools.vala:78+#: libbirdfont/KerningDisplay.vala:713 libbirdfont/OverviewTools.vala:84 msgid "Unicode" msgstr "" -#: libbirdfont/KerningDisplay.vala:683+#: libbirdfont/KerningDisplay.vala:713 msgid "Insert" msgstr "" -#: libbirdfont/KerningDisplay.vala:882 libbirdfont/MainWindow.vala:241-#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:231+#: libbirdfont/KerningDisplay.vala:931 libbirdfont/MainWindow.vala:238+#: libbirdfont/MessageDialog.vala:37 libbirdfont/SpinButton.vala:208 msgid "Close" msgstr "Закрити" @@ -812,16 +802,16 @@ msgstr "Пари кернінгу" msgid "No kerning pairs created." msgstr "" -#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:85+#: libbirdfont/KerningRange.vala:113 libbirdfont/KerningTools.vala:90 msgid "Kerning class" msgstr "Клас кернінгу" -#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:166-#: libbirdfont/Ligatures.vala:118 libbirdfont/Ligatures.vala:141-#: libbirdfont/Ligatures.vala:164 libbirdfont/Ligatures.vala:196-#: libbirdfont/SpacingClass.vala:45 libbirdfont/SpacingTab.vala:232-#: libbirdfont/SpacingTab.vala:276 libbirdfont/SpinButton.vala:231-#: libbirdfont/Theme.vala:687+#: libbirdfont/KerningRange.vala:113 libbirdfont/LayerLabel.vala:144+#: libbirdfont/Ligatures.vala:110 libbirdfont/Ligatures.vala:133+#: libbirdfont/Ligatures.vala:156 libbirdfont/Ligatures.vala:188+#: libbirdfont/SpacingClass.vala:50 libbirdfont/SpacingTab.vala:232+#: libbirdfont/SpacingTab.vala:277 libbirdfont/SpinButton.vala:208+#: libbirdfont/Theme.vala:685 msgid "Set" msgstr "Встановити" @@ -833,52 +823,57 @@ msgstr "" msgid "Kerning Tools" msgstr "" -#: libbirdfont/KerningTools.vala:63 libbirdfont/SpacingTools.vala:31+#: libbirdfont/KerningTools.vala:68 libbirdfont/SpacingTools.vala:31 #, fuzzy msgid "Font Size" msgstr "Розмір шрифту" -#: libbirdfont/KerningTools.vala:82+#: libbirdfont/KerningTools.vala:87 msgid "Create new kerning class." msgstr "Створити новий клас кернінгу." -#: libbirdfont/KerningTools.vala:93+#: libbirdfont/KerningTools.vala:99 msgid "Use text input to enter kerning values." msgstr "Використати текстовий ввід для вводу значень кернінгу." -#: libbirdfont/KerningTools.vala:101 libbirdfont/SpacingTools.vala:52+#: libbirdfont/KerningTools.vala:107 libbirdfont/SpacingClassTools.vala:30+#: libbirdfont/SpacingTools.vala:52 msgid "Insert glyph from overview" msgstr "" -#: libbirdfont/KerningTools.vala:116 libbirdfont/SpacingTools.vala:67+#: libbirdfont/KerningTools.vala:122 libbirdfont/SpacingTools.vala:67 msgid "Insert character by unicode value" msgstr "" -#: libbirdfont/KerningTools.vala:124+#: libbirdfont/KerningTools.vala:130+msgid "Right to left"+msgstr ""++#: libbirdfont/KerningTools.vala:139 msgid "Open a text file with kerning strings first." msgstr "" -#: libbirdfont/KerningTools.vala:126+#: libbirdfont/KerningTools.vala:141 msgid "Previous kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:136+#: libbirdfont/KerningTools.vala:151 msgid "You have reached the beginning of the list." msgstr "" -#: libbirdfont/KerningTools.vala:145+#: libbirdfont/KerningTools.vala:160 msgid "Next kerning string" msgstr "" -#: libbirdfont/KerningTools.vala:155+#: libbirdfont/KerningTools.vala:170 msgid "You have reached the end of the list." msgstr "" -#: libbirdfont/KerningTools.vala:164+#: libbirdfont/KerningTools.vala:179 msgid "Substitutions" msgstr "" -#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:39+#: libbirdfont/LanguageSelectionTab.vala:28 libbirdfont/OverviewTools.vala:44 #, fuzzy msgid "Character Sets" msgstr "Кодування"@@ -887,11 +882,7 @@ msgstr "Кодування" msgid "Character Set" msgstr "Кодування" -#: libbirdfont/LayerLabel.vala:101-msgid "Hide the layer."-msgstr ""--#: libbirdfont/LayerLabel.vala:166+#: libbirdfont/LayerLabel.vala:144 msgid "Layer" msgstr "" @@ -932,23 +923,23 @@ msgid "Contextual Substitutions" msgstr ""  #: libbirdfont/LigatureList.vala:126 libbirdfont/LigatureList.vala:140-#: libbirdfont/Menu.vala:447+#: libbirdfont/Menu.vala:437 msgid "Ligatures" msgstr "" -#: libbirdfont/Ligatures.vala:118+#: libbirdfont/Ligatures.vala:110 msgid "Beginning" msgstr "" -#: libbirdfont/Ligatures.vala:141+#: libbirdfont/Ligatures.vala:133 msgid "Middle" msgstr "" -#: libbirdfont/Ligatures.vala:164+#: libbirdfont/Ligatures.vala:156 msgid "End" msgstr "" -#: libbirdfont/Ligatures.vala:196+#: libbirdfont/Ligatures.vala:188 msgid "Ligature" msgstr "" @@ -977,7 +968,7 @@ msgstr "" msgid "You need an older version of Birdfont to open it." msgstr "" -#: libbirdfont/MainWindow.vala:241+#: libbirdfont/MainWindow.vala:238 msgid "Glyph sequence" msgstr "Послідовність гліфів" @@ -991,7 +982,7 @@ msgstr "Файли" msgid "New" msgstr "_Новий" -#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:81+#: libbirdfont/Menu.vala:57 libbirdfont/RecentFiles.vala:85 #, fuzzy msgid "Recent Files" msgstr "_Останні файли"@@ -1047,8 +1038,8 @@ msgstr "" msgid "Move To Baseline" msgstr "" -#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:257-#: libbirdfont/OverView.vala:276 libbirdfont/OverviewTools.vala:154+#: libbirdfont/Menu.vala:155 libbirdfont/OverView.vala:260+#: libbirdfont/OverView.vala:279 libbirdfont/OverviewTools.vala:188 msgid "Search" msgstr "Пошук" @@ -1128,112 +1119,104 @@ msgstr "Експортувати шрифти" msgid "Export Glyph as SVG" msgstr "_Експорт гліфа як SVG" -#: libbirdfont/Menu.vala:288 libbirdfont/Menu.vala:304+#: libbirdfont/Menu.vala:288 msgid "Import SVG file" msgstr "" -#: libbirdfont/Menu.vala:295 libbirdfont/Menu.vala:313+#: libbirdfont/Menu.vala:295 msgid "Import SVG folder" msgstr "" -#: libbirdfont/Menu.vala:304 libbirdfont/Menu.vala:313-msgid "color"-msgstr ""--#: libbirdfont/Menu.vala:322+#: libbirdfont/Menu.vala:302 msgid "Import Background Image" msgstr "" -#: libbirdfont/Menu.vala:336 libbirdfont/Preview.vala:27+#: libbirdfont/Menu.vala:316 libbirdfont/Preview.vala:27 msgid "Preview" msgstr "Передпрогляд" -#: libbirdfont/Menu.vala:344+#: libbirdfont/Menu.vala:324 msgid "Tab" msgstr "" -#: libbirdfont/Menu.vala:350+#: libbirdfont/Menu.vala:330 #, fuzzy msgid "Next Tab" msgstr "_Наступна вкладка" -#: libbirdfont/Menu.vala:357+#: libbirdfont/Menu.vala:337 #, fuzzy msgid "Previous Tab" msgstr "_Попередня вкладка" -#: libbirdfont/Menu.vala:364+#: libbirdfont/Menu.vala:344 #, fuzzy msgid "Close Tab" msgstr "_Закрити вкладку" -#: libbirdfont/Menu.vala:371+#: libbirdfont/Menu.vala:351 #, fuzzy msgid "Close All Tabs" msgstr "Закрити _усі вкладки" -#: libbirdfont/Menu.vala:379+#: libbirdfont/Menu.vala:359 msgid "Spacing and Kerning" msgstr "" -#: libbirdfont/Menu.vala:385+#: libbirdfont/Menu.vala:365 #, fuzzy msgid "Show Spacing Tab" msgstr "Показати вкладку кернінгу" -#: libbirdfont/Menu.vala:392+#: libbirdfont/Menu.vala:372 #, fuzzy msgid "Show Kerning Tab" msgstr "Показати вкладку кернінгу" -#: libbirdfont/Menu.vala:399+#: libbirdfont/Menu.vala:379 msgid "List Kerning Pairs" msgstr "" -#: libbirdfont/Menu.vala:406 libbirdfont/SpacingClassTab.vala:80+#: libbirdfont/Menu.vala:386 libbirdfont/SpacingClassTab.vala:97 msgid "Spacing Classes" msgstr "" -#: libbirdfont/Menu.vala:413+#: libbirdfont/Menu.vala:393 msgid "Select Next Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:422+#: libbirdfont/Menu.vala:407 msgid "Select Previous Kerning Pair" msgstr "" -#: libbirdfont/Menu.vala:431+#: libbirdfont/Menu.vala:421 msgid "Load Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:438+#: libbirdfont/Menu.vala:428 msgid "Reload Kerning Strings" msgstr "" -#: libbirdfont/Menu.vala:453+#: libbirdfont/Menu.vala:443 msgid "Show Ligatures" msgstr "" -#: libbirdfont/Menu.vala:460+#: libbirdfont/Menu.vala:450 msgid "Add Ligature" msgstr "" -#: libbirdfont/Menu.vala:469+#: libbirdfont/Menu.vala:459 msgid "Git" msgstr "" -#: libbirdfont/Menu.vala:475+#: libbirdfont/Menu.vala:465 msgid "Save As .bfp" msgstr "" -#: libbirdfont/Menu.vala:484 libbirdfont/OverView.vala:478+#: libbirdfont/Menu.vala:474 libbirdfont/OverView.vala:495 msgid "Overview" msgstr "Огляд" -#: libbirdfont/Menu.vala:513-msgid "Help"-msgstr ""- #: libbirdfont/MenuItem.vala:82 msgid "UP" msgstr ""@@ -1267,7 +1250,11 @@ msgstr "" msgid "Menu" msgstr "Меню" -#: libbirdfont/MenuTab.vala:696+#: libbirdfont/MenuTab.vala:216+msgid "Can't create TTF font."+msgstr ""++#: libbirdfont/MenuTab.vala:702 msgid "Add ligature" msgstr "" @@ -1275,27 +1262,31 @@ msgstr "" msgid "Move paths" msgstr "Пересунути контури" -#: libbirdfont/OtfFeatureTable.vala:102 libbirdfont/OtfFeatureTable.vala:167+#: libbirdfont/OtfFeatureTable.vala:124 libbirdfont/OtfFeatureTable.vala:197 msgid "Glyph Substitutions" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:108+#: libbirdfont/OtfFeatureTable.vala:130 libbirdfont/OtfFeatureTable.vala:138 msgid "New glyph" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:115+#: libbirdfont/OtfFeatureTable.vala:145 msgid "Replacement" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:120+#: libbirdfont/OtfFeatureTable.vala:150 msgid "Tag" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:181+#: libbirdfont/OtfFeatureTable.vala:212+msgid "Select a glyph to create an alternate for."+msgstr ""++#: libbirdfont/OtfFeatureTable.vala:218 msgid "Glyph name" msgstr "" -#: libbirdfont/OtfFeatureTable.vala:200+#: libbirdfont/OtfFeatureTable.vala:232 msgid "All glyphs must have unique names." msgstr "" @@ -1315,11 +1306,15 @@ msgstr "" msgid "Swashes" msgstr "" -#: libbirdfont/OverView.vala:257 libbirdfont/OverView.vala:276+#: libbirdfont/OverView.vala:260 libbirdfont/OverView.vala:279 msgid "Filter" msgstr "Фільтр" -#: libbirdfont/OverView.vala:1498+#: libbirdfont/OverView.vala:699+msgid "No glyphs in this view."+msgstr "Не показувати гліф тут."++#: libbirdfont/OverView.vala:1562 msgid "See also:" msgstr "Дивіться також:" @@ -1340,43 +1335,44 @@ msgstr "Відміна" msgid "Yes, don't ask again." msgstr "Так, більше не запитувати." -#: libbirdfont/OverviewTools.vala:41 libbirdfont/OverviewTools.vala:119+#: libbirdfont/OverviewTools.vala:46 libbirdfont/OverviewTools.vala:117+#: libbirdfont/OverviewTools.vala:153 msgid "Transform" msgstr "" -#: libbirdfont/OverviewTools.vala:43+#: libbirdfont/OverviewTools.vala:49 msgid "Multi-Master" msgstr "" -#: libbirdfont/OverviewTools.vala:56+#: libbirdfont/OverviewTools.vala:62 msgid "All Glyphs" msgstr "" -#: libbirdfont/OverviewTools.vala:66+#: libbirdfont/OverviewTools.vala:72 msgid "Default" msgstr "" -#: libbirdfont/OverviewTools.vala:93+#: libbirdfont/OverviewTools.vala:99 msgid "Skew" msgstr "" -#: libbirdfont/OverviewTools.vala:106+#: libbirdfont/OverviewTools.vala:132 msgid "Resize" msgstr "" -#: libbirdfont/OverviewTools.vala:134+#: libbirdfont/OverviewTools.vala:168 msgid "Create alternate" msgstr "" -#: libbirdfont/OverviewTools.vala:138+#: libbirdfont/OverviewTools.vala:172 msgid "Set curve orientation" msgstr "" -#: libbirdfont/OverviewTools.vala:160+#: libbirdfont/OverviewTools.vala:194 msgid "Master Size" msgstr "" -#: libbirdfont/OverviewTools.vala:175+#: libbirdfont/OverviewTools.vala:209 msgid "Create new master font" msgstr "" @@ -1392,7 +1388,7 @@ msgstr "" msgid "Add new points" msgstr "Додати нові точки" -#: libbirdfont/PointTool.vala:24+#: libbirdfont/PointTool.vala:84 msgid "Move control points" msgstr "Перемістити керуючі точки" @@ -1408,19 +1404,19 @@ msgstr "Експортувати шрифти" msgid "Generate html document" msgstr "Генерувати документ html" -#: libbirdfont/RecentFiles.vala:62+#: libbirdfont/RecentFiles.vala:66 msgid "No fonts created yet" msgstr "" -#: libbirdfont/RecentFiles.vala:65+#: libbirdfont/RecentFiles.vala:69 msgid "Create a New Font" msgstr "" -#: libbirdfont/RecentFiles.vala:76+#: libbirdfont/RecentFiles.vala:80 msgid "Glyphs" msgstr "" -#: libbirdfont/RecentFiles.vala:92+#: libbirdfont/RecentFiles.vala:96 #, fuzzy msgid "Backups" msgstr "Резервна копія"@@ -1445,43 +1441,48 @@ msgstr "Відкинути" msgid "Save?" msgstr "Зберегти?" -#: libbirdfont/SettingsTab.vala:80+#: libbirdfont/SettingsTab.vala:82 msgid "Precision for pen tool" msgstr "" -#: libbirdfont/SettingsTab.vala:88+#: libbirdfont/SettingsTab.vala:90 msgid "Show or hide control point handles" msgstr "" -#: libbirdfont/SettingsTab.vala:98+#: libbirdfont/SettingsTab.vala:100 msgid "Fill open paths." msgstr "" -#: libbirdfont/SettingsTab.vala:105+#: libbirdfont/SettingsTab.vala:107 msgid "Use TTF units." msgstr "Використати одиниці TTF." -#: libbirdfont/SettingsTab.vala:108+#: libbirdfont/SettingsTab.vala:110 msgid "Number of points added by the freehand tool" msgstr "" -#: libbirdfont/SettingsTab.vala:130+#: libbirdfont/SettingsTab.vala:132 msgid "Path simplification threshold" msgstr "" -#: libbirdfont/SettingsTab.vala:149+#: libbirdfont/SettingsTab.vala:163+#, fuzzy+msgid "Translate"+msgstr "Не перекладати"++#: libbirdfont/SettingsTab.vala:170 msgid "Color theme" msgstr "" -#: libbirdfont/SettingsTab.vala:151+#: libbirdfont/SettingsTab.vala:172 msgid "Key Bindings" msgstr "" -#: libbirdfont/SpacingClass.vala:45+#: libbirdfont/SpacingClass.vala:50 msgid "Character" msgstr "" -#: libbirdfont/SpacingClassTab.vala:69+#: libbirdfont/SpacingClassTab.vala:86 msgid "New spacing class" msgstr "" @@ -1493,289 +1494,293 @@ msgstr "" msgid "Left" msgstr "" -#: libbirdfont/SpacingTab.vala:276+#: libbirdfont/SpacingTab.vala:277 msgid "Right" msgstr "" -#: libbirdfont/Theme.vala:421+#: libbirdfont/SvgParser.vala:51 libbirdfont/SvgParser.vala:95+msgid "Import"+msgstr "Імпорт"++#: libbirdfont/Theme.vala:419 msgid "Canvas Background" msgstr "" -#: libbirdfont/Theme.vala:422+#: libbirdfont/Theme.vala:420 msgid "Filled Stroke" msgstr "" -#: libbirdfont/Theme.vala:423+#: libbirdfont/Theme.vala:421 #, fuzzy msgid "Stroke Color" msgstr "Колір штриха" -#: libbirdfont/Theme.vala:424+#: libbirdfont/Theme.vala:422 #, fuzzy msgid "Handle Color" msgstr "Колір держака" -#: libbirdfont/Theme.vala:425+#: libbirdfont/Theme.vala:423 msgid "Fill Color" msgstr "" -#: libbirdfont/Theme.vala:426+#: libbirdfont/Theme.vala:424 msgid "Selected Objects" msgstr "" -#: libbirdfont/Theme.vala:428+#: libbirdfont/Theme.vala:426 msgid "Background 1" msgstr "" -#: libbirdfont/Theme.vala:429+#: libbirdfont/Theme.vala:427 msgid "Dialog Background" msgstr "" -#: libbirdfont/Theme.vala:430+#: libbirdfont/Theme.vala:428 msgid "Menu Background" msgstr "" -#: libbirdfont/Theme.vala:431+#: libbirdfont/Theme.vala:429 msgid "Default Background" msgstr "" -#: libbirdfont/Theme.vala:433+#: libbirdfont/Theme.vala:431 msgid "Checkbox Background" msgstr "" -#: libbirdfont/Theme.vala:435+#: libbirdfont/Theme.vala:433 msgid "Foreground 1" msgstr "" -#: libbirdfont/Theme.vala:436+#: libbirdfont/Theme.vala:434 msgid "Text Foreground" msgstr "" -#: libbirdfont/Theme.vala:437+#: libbirdfont/Theme.vala:435 msgid "Table Border" msgstr "" -#: libbirdfont/Theme.vala:438+#: libbirdfont/Theme.vala:436 msgid "Selection Border" msgstr "" -#: libbirdfont/Theme.vala:439+#: libbirdfont/Theme.vala:437 msgid "Overview Glyph" msgstr "" -#: libbirdfont/Theme.vala:440+#: libbirdfont/Theme.vala:438 msgid "Foreground Inverted" msgstr "" -#: libbirdfont/Theme.vala:441+#: libbirdfont/Theme.vala:439 msgid "Menu Foreground" msgstr "" -#: libbirdfont/Theme.vala:442+#: libbirdfont/Theme.vala:440 msgid "Selected Tab Foreground" msgstr "" -#: libbirdfont/Theme.vala:443+#: libbirdfont/Theme.vala:441 msgid "Tab Separator" msgstr "" -#: libbirdfont/Theme.vala:445+#: libbirdfont/Theme.vala:443 msgid "Highlighted 1" msgstr "" -#: libbirdfont/Theme.vala:446+#: libbirdfont/Theme.vala:444 msgid "Highlighted Guide" msgstr "" -#: libbirdfont/Theme.vala:448+#: libbirdfont/Theme.vala:446 msgid "Grid" msgstr "" -#: libbirdfont/Theme.vala:450+#: libbirdfont/Theme.vala:448 msgid "Guide 1" msgstr "" -#: libbirdfont/Theme.vala:451+#: libbirdfont/Theme.vala:449 msgid "Guide 2" msgstr "" -#: libbirdfont/Theme.vala:452+#: libbirdfont/Theme.vala:450 msgid "Guide 3" msgstr "" -#: libbirdfont/Theme.vala:454+#: libbirdfont/Theme.vala:452 msgid "Button Border 1" msgstr "" -#: libbirdfont/Theme.vala:455+#: libbirdfont/Theme.vala:453 msgid "Button Background 1" msgstr "" -#: libbirdfont/Theme.vala:456+#: libbirdfont/Theme.vala:454 msgid "Button Border 2" msgstr "" -#: libbirdfont/Theme.vala:457+#: libbirdfont/Theme.vala:455 msgid "Button Background 2" msgstr "" -#: libbirdfont/Theme.vala:458+#: libbirdfont/Theme.vala:456 msgid "Button Border 3" msgstr "" -#: libbirdfont/Theme.vala:459+#: libbirdfont/Theme.vala:457 msgid "Button Background 3" msgstr "" -#: libbirdfont/Theme.vala:460+#: libbirdfont/Theme.vala:458 msgid "Button Border 4" msgstr "" -#: libbirdfont/Theme.vala:461+#: libbirdfont/Theme.vala:459 msgid "Button Background 4" msgstr "" -#: libbirdfont/Theme.vala:463+#: libbirdfont/Theme.vala:461 msgid "Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:464+#: libbirdfont/Theme.vala:462 msgid "Selected Button Foreground" msgstr "" -#: libbirdfont/Theme.vala:466+#: libbirdfont/Theme.vala:464 msgid "Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:467+#: libbirdfont/Theme.vala:465 msgid "Selected Tool Foreground" msgstr "" -#: libbirdfont/Theme.vala:469+#: libbirdfont/Theme.vala:467 msgid "Text Area Background" msgstr "" -#: libbirdfont/Theme.vala:471+#: libbirdfont/Theme.vala:469 msgid "Overview Item Border" msgstr "" -#: libbirdfont/Theme.vala:473+#: libbirdfont/Theme.vala:471 msgid "Selected Overview Item" msgstr "" -#: libbirdfont/Theme.vala:474+#: libbirdfont/Theme.vala:472 msgid "Overview Item 1" msgstr "" -#: libbirdfont/Theme.vala:475+#: libbirdfont/Theme.vala:473 msgid "Overview Item 2" msgstr "" -#: libbirdfont/Theme.vala:477+#: libbirdfont/Theme.vala:475 msgid "Overview Selected Foreground" msgstr "" -#: libbirdfont/Theme.vala:478+#: libbirdfont/Theme.vala:476 msgid "Overview Foreground" msgstr "" -#: libbirdfont/Theme.vala:480+#: libbirdfont/Theme.vala:478 msgid "Glyph Count Background 1" msgstr "" -#: libbirdfont/Theme.vala:481+#: libbirdfont/Theme.vala:479 msgid "Glyph Count Background 2" msgstr "" -#: libbirdfont/Theme.vala:483+#: libbirdfont/Theme.vala:481 msgid "Dialog Shadow" msgstr "" -#: libbirdfont/Theme.vala:485+#: libbirdfont/Theme.vala:483 msgid "Selected Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:486+#: libbirdfont/Theme.vala:484 msgid "Selected Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:487+#: libbirdfont/Theme.vala:485 msgid "Active Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:488+#: libbirdfont/Theme.vala:486 msgid "Cubic Control Point" msgstr "" -#: libbirdfont/Theme.vala:490+#: libbirdfont/Theme.vala:488 msgid "Selected Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:491+#: libbirdfont/Theme.vala:489 msgid "Selected Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:492+#: libbirdfont/Theme.vala:490 msgid "Active Quadratic Control Point" msgstr "" -#: libbirdfont/Theme.vala:493+#: libbirdfont/Theme.vala:491 msgid "Cubic Quadratic Point" msgstr "" -#: libbirdfont/Theme.vala:495+#: libbirdfont/Theme.vala:493 msgid "Selected Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:496+#: libbirdfont/Theme.vala:494 msgid "Active Handle" msgstr "" -#: libbirdfont/Theme.vala:497+#: libbirdfont/Theme.vala:495 msgid "Control Point Handle" msgstr "" -#: libbirdfont/Theme.vala:499+#: libbirdfont/Theme.vala:497 msgid "Merge" msgstr "" -#: libbirdfont/Theme.vala:500+#: libbirdfont/Theme.vala:498 msgid "Spin Button" msgstr "" -#: libbirdfont/Theme.vala:501+#: libbirdfont/Theme.vala:499 msgid "Active Spin Button" msgstr "" -#: libbirdfont/Theme.vala:502+#: libbirdfont/Theme.vala:500 msgid "Zoom Bar Border" msgstr "" -#: libbirdfont/Theme.vala:503+#: libbirdfont/Theme.vala:501 msgid "Font Name" msgstr "" -#: libbirdfont/Theme.vala:687+#: libbirdfont/Theme.vala:685 msgid "New theme" msgstr "" -#: libbirdfont/ThemeTab.vala:118+#: libbirdfont/ThemeTab.vala:107 msgid "Add new theme" msgstr "" -#: libbirdfont/ThemeTab.vala:120+#: libbirdfont/ThemeTab.vala:109 msgid "Colors" msgstr "" -#: libbirdfont/ThemeTab.vala:147+#: libbirdfont/ThemeTab.vala:152 msgid "Dark" msgstr "" -#: libbirdfont/ThemeTab.vala:149+#: libbirdfont/ThemeTab.vala:154 msgid "Bright" msgstr "" -#: libbirdfont/ThemeTab.vala:153+#: libbirdfont/ThemeTab.vala:158 msgid "Custom" msgstr "" @@ -1783,7 +1788,7 @@ msgstr "" msgid "Color" msgstr "" -#: libbirdfont/ToolItem.vala:66+#: libbirdfont/ToolItem.vala:44 msgid "Shift" msgstr "" @@ -1795,7 +1800,7 @@ msgstr "Вільне рисування" msgid "New version" msgstr "Нова версія" -#: birdfont/GtkWindow.vala:531+#: birdfont/GtkWindow.vala:443 msgid "Your fonts have been exported." msgstr "" @@ -1827,12 +1832,6 @@ msgstr "" msgid "Writing" msgstr "Запис" -#~ msgid "No glyphs in this view."-#~ msgstr "Не показувати гліф тут."--#~ msgid "Import"-#~ msgstr "Імпорт"- #, fuzzy #~ msgid "Full name (name and style)" #~ msgstr "Повне ім'я"diff --git a/resources/Roboto-Regular.ttf b/resources/Roboto-Regular.ttfnew file mode 100644index 0000000..8c082c8Binary files /dev/null and b/resources/Roboto-Regular.ttf differdiff --git a/resources/dark.theme b/resources/dark.themeindex 5ccae44..4eab6e8 100644--- a/resources/dark.theme+++ b/resources/dark.theme@@ -8,7 +8,6 @@ 	<color name="Guide 2" red="0.69999999999999996" green="0" blue="0" alpha="0.5"/> 	<color name="Guide 3" red="0.47058823529411764" green="0.26666666666666666" blue="0.47058823529411764" alpha="0.47058823529411764"/> 	<color name="Tab Separator" red="0.4823529411764706" green="0.49803921568627452" blue="0.51764705882352946" alpha="1"/>-	<color name="Objects" red="0" green="0" blue="0" alpha="1"/> 	<color name="Overview Glyph" red="0.85882352941176465" green="0.8666666666666667" blue="0.9137254901960784" alpha="1"/> 	<color name="Dialog Shadow" red="0" green="0" blue="0" alpha="0.29999999999999999"/> 	<color name="Selected Active Cubic Control Point" red="0.91764705882352937" green="0.30196078431372547" blue="0.10196078431372549" alpha="1"/>@@ -58,6 +57,7 @@ 	<color name="Spin Button" red="0.41960784313725491" green="0.4392156862745098" blue="0.47843137254901963" alpha="1"/> 	<color name="Text Tool Box" red="0.50196078431372548" green="0.50980392156862742" blue="0.53333333333333333" alpha="1"/> 	<color name="Overview Foreground" red="0.17647058823529413" green="0.17647058823529413" blue="0.17647058823529413" alpha="1"/>+	<color name="Selected Objects" red="0.13725490196078433" green="0.51372549019607838" blue="0.76078431372549016" alpha="1"/> 	<color name="Tool Foreground" red="0.4823529411764706" green="0.49803921568627452" blue="0.51764705882352946" alpha="1"/> 	<color name="Selected Quadratic Control Point" red="0.91764705882352937" green="0.30196078431372547" blue="0.10196078431372549" alpha="1"/> 	<color name="Checkbox Background" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/>diff --git a/resources/icons.bf b/resources/icons.bfindex 2a3660b..da9bce2 100644--- a/resources/icons.bf+++ b/resources/icons.bf@@ -38,6 +38,22 @@ GNU Lesser General Public License</copyright> <grid width="4.0000"/> <background scale="1.0000" /> +<collection unicode="U+20">+	<selected id="0"/>+	<glyph id="0" left="0" right="27">+	</glyph>+</collection>++<collection name=".notdef">+	<selected id="0"/>+	<glyph id="0" left="-20" right="33">+		<layer name= "Layer" visible="true">+			<path data="S -15.0000000000,10.0000000000 L 15.0000000000,10.0000000000 L 15.0000000000,44.0000000000 L -15.0000000000,44.0000000000 L -15.0000000000,10.0000000000" />+			<path data="S -20.0000000000,49.0000000000 L 20.0000000000,49.0000000000 L 20.0000000000,5.0000000000 L -20.0000000000,5.0000000000 L -20.0000000000,49.0000000000" />+		</layer>+	</glyph>+</collection>+ <collection unicode="U+30"> 	<selected id="1"/> 	<glyph id="1" left="-28" right="28">@@ -324,7 +340,6 @@ GNU Lesser General Public License</copyright> 			<path data="B -26.0000000000,11.3175355450 M 24.0000000000,11.3175355450 M 24.0000000000,7.3175355450 M -26.0000000000,7.3175355450 M -26.0000000000,11.3175355450" /> 			<path data="B -2.0379146919,25.1240511107 M 24.0000000000,25.0394944708 C 24.0000000000,23.0394944708 24.0000000000,22.3728278041 24.0000000000,21.0394944708 M -2.0379146919,21.1240511107 M -2.0379146919,25.1240511107" /> 			<path data="B -16.0000000000,35.0394944708 M -16.0000000000,29.0394944708 M -10.0000000000,29.0394944708 M -10.0000000000,25.0394944708 M -16.0000000000,25.0394944708 M -16.0000000000,19.0394944708 M -20.0000000000,19.0394944708 M -20.0000000000,25.0394944708 M -26.0000000000,25.0394944708 M -26.0000000000,29.0394944708 M -20.0000000000,29.0394944708 M -20.0000000000,31.4394944708 M -20.0000000000,35.0394944708 M -16.0000000000,35.0394944708" />-			<path data="B -37.7796208531,18.7954186414 M -37.7796208531,18.7954186414 O" /> 		</layer> 	</glyph> </collection>@@ -1302,6 +1317,18 @@ GNU Lesser General Public License</copyright> 	</glyph> </collection> +<collection name="right_to_left">+	<selected id="0"/>+	<glyph id="0" left="-28" right="28">+		<layer name= "Layer" visible="true">+			<path data="B -16.5660050993,25.0660007440 M -22.4601324350,25.0660007440 M -22.4601324350,14.9150371313 M -25.7863310218,14.9150371313 M -25.7863310218,40.0080885030 M -17.4794349467,40.0080885030 Q -13.2398065125,40.0080885030 -10.9648793467,38.0778523340 Q -8.6727278669,36.1476185182 -8.6727278669,32.4594905022 Q -8.6727278669,30.1156331374 -9.9480565539,28.3749750167 Q -11.2061609268,26.6343168959 -13.4638402480,25.7726046987 M -7.5697364427,15.1218465527 M -7.5697364427,14.9150136008 M -11.1199922954,14.9150136008 M -16.5660050993,25.0660007440" />+			<path data="B -22.4601324350,27.7717522422 M -17.3760184707,27.7717522422 Q -14.9115297282,27.7717522422 -13.4638402480,29.0470856353 Q -11.9989499842,30.3224213814 -11.9989499842,32.4594669717 Q -11.9989499842,34.7860882571 -13.3949194612,36.0269541977 Q -14.7736646241,37.2678201382 -17.3932663153,37.2850538645 M -22.4601324350,37.2850538645 M -22.4601324350,27.7717522422" />+			<path data="B 11.9049625094,37.2850773949 M 3.8393244838,37.2850773949 M 3.8393244838,14.9150371313 M 0.5475980556,14.9150371313 M 0.5475980556,37.2850773949 M -7.5008156559,37.2850773949 M -7.5008156559,40.0080885030 M 11.9049625094,40.0080885030 M 11.9049625094,37.2850773949" />+			<path data="B 18.9882263702,17.6208074539 M 30.8798504567,17.6208074539 M 30.8798504567,14.9150371313 M 15.6620042530,14.9150371313 M 15.6620042530,40.0080885030 M 18.9882263702,40.0080885030 M 18.9882263702,17.6208074539" />+		</layer>+	</glyph>+</collection>+ <collection name="rotation"> 	<selected id="1"/> 	<glyph id="1" left="-28" right="45.892473118279582">@@ -1531,6 +1558,16 @@ GNU Lesser General Public License</copyright> 	</glyph> </collection> +<collection name="svg_to_birdfont">+	<selected id="0"/>+	<glyph id="0" left="-28" right="28">+		<layer name= "Layer" visible="true">+			<path data="B 16.7076588131,10.8513073898 C 15.7231524448,9.9469553352 15.5807509176,9.7659357149 14.6423764406,9.0488058549 C 13.5057311121,8.1801523211 12.2905854087,7.4659307350 11.0296823768,6.7964067053 C 10.1563761363,6.3821294164 9.9754061531,6.2785620276 9.0758899297,5.9227415545 C 8.1391541626,5.5521981945 7.1848972751,5.2666070701 6.2150274381,4.9992162905 C 4.4730691430,4.5966439491 2.7426117470,4.3231832970 0.9471021989,4.3231800769 C -1.4036679044,4.3232109113 -3.6691272290,4.7738560147 -5.9066385128,5.4613695897 C -6.8553959447,5.7960233026 -7.7869532369,6.1479503792 -8.6961864831,6.5814537019 C -9.5319370708,6.9799220357 -9.7185424877,7.1024922077 -10.5350789897,7.5599247218 C -12.0900969403,8.5275575451 -13.4800272350,9.5957176587 -14.8133706455,10.8514192213 C -16.5146470739,12.4536287141 -17.7817578316,14.4830758386 -18.8683932948,16.5295176231 C -19.2826705837,17.4028238636 -19.3862379725,17.5837938468 -19.7420584456,18.4833100702 C -20.1126018056,19.4200458373 -20.3981929300,20.3743027248 -20.6655837096,21.3441725618 C -20.9371873502,22.5194202530 -21.1922901929,23.7071010331 -21.2691753057,24.9146283775 C -21.3051598316,25.4797871898 -21.3174741666,26.0462045777 -21.3416199229,26.6119928346 C -21.4401332657,28.9203774571 -20.8753555454,31.2790597693 -20.2034304103,33.4658385129 C -19.8687766973,34.4145959449 -19.5168496208,35.3461532370 -19.0833462980,36.2553864833 C -18.6848779642,37.0911370709 -18.5623077921,37.2777424878 -18.1048752781,38.0942789898 C -17.1372424548,39.6492969403 -16.0690823413,41.0392272350 -14.8133807788,42.3725706454 C -13.2111712859,44.0738470739 -11.1817241614,45.3409578317 -9.1352823768,46.4275932949 C -8.2619761363,46.8418705838 -8.0810061531,46.9454379726 -7.1814899297,47.3012584457 C -6.2447541626,47.6718018056 -5.2904972750,47.9573929301 -4.3206274381,48.2247837096 C -2.5786584927,48.6273585123 -0.8481867941,48.9008238787 0.9473342165,48.9008199226 C 3.2980895957,48.9007907599 5.5635418475,48.4501394934 7.8010385128,47.7626304102 C 8.7497959448,47.4279766973 9.6813532369,47.0760496207 10.5905864832,46.6425462979 C 11.4263370708,46.2440779641 11.6129424877,46.1215077921 12.4294789897,45.6640752780 C 14.8191220160,44.1770847083 16.1026710812,43.1310420349 17.8473979348,41.1319571268 C 18.0793416679,40.8661990711 18.2962073608,40.5874428511 18.5103941452,40.3071764406 C 19.3790476789,39.1705311121 20.0932692651,37.9553854086 20.7627932948,36.6944823766 C 21.1770705837,35.8211761362 21.2806379725,35.6402061530 21.6364584456,34.7406899295 C 22.0070018056,33.8039541625 22.2925929300,32.8496972749 22.5599837096,31.8798274380 C 22.8315873502,30.7045797468 23.0866901929,29.5168989667 23.1635753057,28.3093716224 C 23.1995598316,27.7442128102 23.2118741666,27.1777954223 23.2360199229,26.6120071654 C 23.3345332657,24.3036225430 22.7697555453,21.9449402309 22.0978304102,19.7581614874 C 21.7631766973,18.8094040554 21.4112496207,17.8778467632 20.9777462980,16.9686135170 C 20.5792779642,16.1328629294 20.4567077921,15.9462575124 19.9992752781,15.1297210104 C 18.0896264251,12.0608521439 16.7076453147,10.8512938918 16.7076588131,10.8513073898" />+			<path data="B -10.7167370146,41.6381552425 C -10.9543525818,41.4581381700 -11.1911866942,41.2764151802 -11.4161570286,41.0808246569 C -12.0510542281,40.5288413219 -13.4564483359,39.3963571666 -15.2718705294,36.5016132704 C -15.6694354900,35.7972937754 -15.7759432590,35.6363245264 -16.1223858403,34.9155308315 C -16.4996302761,34.1306521083 -16.8063480434,33.3261549289 -17.0981513479,32.5068067383 C -17.6827272845,30.6251214234 -18.1721511604,28.6004264355 -18.0916199229,26.6120071654 C -18.0302404652,25.0964698372 -17.8677884185,23.6812682559 -17.5311832972,22.2032616462 C -17.3037766092,21.3678388326 -17.0604926301,20.5456993181 -16.7442273761,19.7385028358 C -16.4393854186,18.9604617684 -16.3507974378,18.8045239866 -15.9955416831,18.0491306059 C -15.0639292984,16.2800280465 -13.9786861469,14.5367233233 -12.5152837399,13.1495263933 C -11.4051375821,12.0971901838 -10.2380530103,11.2054825747 -8.9424132704,10.3929294705 C -8.2380937753,9.9953645099 -8.0771245263,9.8888567409 -7.3563308314,9.5424141597 C -6.5714521083,9.1651697239 -5.7669549288,8.8584519565 -4.9476067382,8.5666486521 C -3.0240124811,7.9690530257 -1.0762162305,7.5732071190 0.9471311612,7.5731800767 C 2.4488258668,7.5731898304 3.8975899190,7.8014885861 5.3559383537,8.1336167028 C 6.1913611673,8.3610233908 7.0135006818,8.6043073700 7.8206971641,8.9205726240 C 8.5987382315,9.2254145815 8.7546760133,9.3140025623 9.5100693939,9.6692583169 C 10.5916854840,10.2388391701 11.6347786373,10.8461576283 12.6111370146,11.5858447576 C 12.8309307109,11.7523600168 13.6671739867,12.4070238405 14.4096736066,13.1495162601 C 14.9705294099,13.7411876165 15.1018887024,13.8563899675 15.6128330947,14.4876209308 C 16.1875397432,15.1976250661 16.6817297752,15.9497722957 17.1662705293,16.7223867297 C 2.1312000000,17.6136000000 -8.8800000000,29.0984000000 -10.7167370146,41.6381552425" />+		</layer>+	</glyph>+</collection>+ <collection name="symmetric"> 	<selected id="1"/> 	<glyph id="1" left="-40.784482758620676" right="42.890804597701162">@@ -1614,6 +1651,16 @@ GNU Lesser General Public License</copyright> 	</glyph> </collection> +<collection name="translate">+	<selected id="0"/>+	<glyph id="0" left="-28" right="28">+		<layer name= "Layer" visible="true">+			<path data="B -8.7490642589,49.3988532131 C -6.3869401212,50.3651767240 -4.3469238204,50.1504381663 -1.4479532876,48.9693760972 T C 1.2293855707,47.8786084141 3.0615564298,44.4598663798 -0.1595219398,43.9230199847 T C -3.3806003095,43.3861735897 -7.6753714690,47.6809447493 -8.7490642589,49.3988532131" />+			<path data="B -20.0228385528,33.5081999227 C -14.2248974874,34.8324210304 -6.1722015632,36.4071704554 -2.6290153565,37.4808632453 T C 0.9141708501,38.5545560352 8.3226511004,41.1314187310 9.6110824483,41.1314187310 T C 10.8995137961,41.1314187310 13.5837457707,41.7756344048 14.8721771186,40.3798337780 T C 16.1606084666,38.9840331512 17.3416705355,38.9840331511 8.7521282163,37.3734939663 T C 0.1625858972,35.7629547815 2.7394485929,36.0134830991 -0.2668912188,35.3334776655 M 2.3099714770,33.0787228069 C 1.5583865241,31.0387065061 0.1625858972,21.9123177920 -1.1258454507,18.1543930272 C 3.3120847475,15.2912122543 6.8194811945,11.2827591720 12.1879451440,9.5648507082 T C 17.7862147007,7.7734044500 21.5648621756,7.4890446477 26.2533206915,6.4511416175 C 22.4953959270,4.3037560377 23.7838272747,4.6258638747 13.2616379339,3.5521710848 T C 8.0179209976,3.0170979280 2.5247100350,11.4974977300 -2.8437539145,15.4701610526 C -3.7027081464,13.7522525888 -6.2541544206,11.0696298246 -10.4669727228,9.3501121502 T C -15.7280673932,7.2027265704 -22.0628548536,7.0953572913 -25.3913025023,7.6322036864 C -20.8102132654,9.1353735921 -15.2988717451,10.5981041010 -13.6880510924,11.6048670090 T C -10.2522341648,13.7522525888 -7.0311557951,16.2217460054 -5.5279858892,19.2280858171 M -12.6143583025,26.4218275094 M -15.8354366722,28.0323666944 C -15.7280673932,28.3186847717 -14.6543746033,29.3207980421 -13.0438354185,29.4281673211 T C -11.8850313613,29.5054209250 -11.3259269547,28.6765823683 -9.2859106539,26.5291967884 T C -8.2992874836,25.4906460827 -5.4206166103,22.9860105819 -4.5616623783,21.8049485130 C -3.7027081464,23.7375955348 -3.4879695884,24.8112883247 -2.9511231935,27.2807817413 T C -2.0107080383,31.6066914556 -2.4142767986,34.7966312706 -3.4879695884,35.1187391077 M -15.2985902773,32.4345071328 C -16.4080728268,32.3271378538 -18.4122993678,31.6829221800 -18.6270379259,32.1123992960 T C -18.8417764839,32.5418764118 -19.5575716772,33.0429330471 -20.0228385528,33.5081999227" />+		</layer>+	</glyph>+</collection>+ <collection name="ttf_units"> 	<selected id="1"/> 	<glyph id="1" left="-28" right="33.862433862433868">@@ -1800,6 +1847,7 @@ GNU Lesser General Public License</copyright> <ligature sequence="o r i e n t a t i o n _ b o t h" replacement="orientation_both"/> <ligature sequence="q u a d r a t i c _ p o i n t s" replacement="quadratic_points"/> <ligature sequence="s c a l e _ b a c k g r o u n d" replacement="scale_background"/>+<ligature sequence="s v g _ t o _ b i r d f o n t" replacement="svg_to_birdfont"/> <ligature sequence="z o o m _ b o u n d a r i e s" replacement="zoom_boundaries"/> <ligature sequence="s h o w _ b a c k g r o u n d" replacement="show_background"/> <ligature sequence="f l i p _ h o r i z o n t a l" replacement="flip_horizontal"/>@@ -1811,6 +1859,7 @@ GNU Lesser General Public License</copyright> <ligature sequence="c u t _ b a c k g r o u n d" replacement="cut_background"/> <ligature sequence="i n s e r t _ u n i c h a r" replacement="insert_unichar"/> <ligature sequence="l i n e _ c a p _ r o u n d" replacement="line_cap_round"/>+<ligature sequence="r i g h t _ t o _ l e f t" replacement="right_to_left"/> <ligature sequence="a d d _ n e w _ t h e m e" replacement="add_new_theme"/> <ligature sequence="k e r n i n g _ c l a s s" replacement="kerning_class"/> <ligature sequence="d o u b l e _ p o i n t s" replacement="double_points"/>@@ -1844,6 +1893,7 @@ GNU Lesser General Public License</copyright> <ligature sequence="h e l p _ l i n e s" replacement="help_lines"/> <ligature sequence="l e f t _ a r r o w" replacement="left_arrow"/> <ligature sequence="c l o s e _ p a t h" replacement="close_path"/>+<ligature sequence="t r a n s l a t e" replacement="translate"/> <ligature sequence="t r a n s f o r m" replacement="transform"/> <ligature sequence="a d d _ l a y e r" replacement="add_layer"/> <ligature sequence="o p e n _ f o n t" replacement="open_font"/>diff --git a/resources/linux/birdfont-import.1 b/resources/linux/birdfont-import.1index 95bd099..e41b452 100644--- a/resources/linux/birdfont-import.1+++ b/resources/linux/birdfont-import.1@@ -20,10 +20,5 @@ birdfont-import typeface.bf U+62.svg See also birdfont-export for creating SVG, EOT and TTF fonts from the birdfont file. -.SH OPTIONS-.TP 5-\--color-Preserve colors and create OpenType SVG table instead of using TrueType.- .SH AUTHOR Johan Mattssondiff --git a/scripts/builder.py b/scripts/builder.pyindex 708de12..d28d4d1 100644--- a/scripts/builder.py+++ b/scripts/builder.py@@ -106,7 +106,7 @@ class Builder(object):             command = command.replace('OBJECT_FILE', object_path)             yield {                 'basename': 'compile ' + csource,-                'file_dep': [build_file, csource] + copied_cheader,+                'file_dep': [build_file, csource] + bindep + copied_cheader,                 'actions': [command],                 'targets': [path.join(build_directory, object_file)],             }@@ -114,7 +114,7 @@ class Builder(object):         object_paths = [path.join(build_directory, f) for f in object_files]          yield {             'basename': source_directory,-            'file_dep': object_paths + [build_file],+            'file_dep': object_paths + [build_file] + bindep,             'actions': [linker_command],             'targets': [path.join('build', 'bin', target_binary)]         }@@ -138,7 +138,10 @@ def is_up_to_date(task):      for dep in task['file_dep']:         if not path.isfile(dep):-            print('Dependency is not created yet: ' + dep + ' needed for ' + task['targets'])+            targets = " ".join(str(x) for x in task['targets'])+            print('Build failed because dependency is not created yet: ' + dep)+            print()+            print('Targetes depending on ' + dep + ":\n" + targets)             exit(1)      target_times = []diff --git a/scripts/configfile.py b/scripts/configfile.pyindex e1cef8f..0ee5338 100755--- a/scripts/configfile.py+++ b/scripts/configfile.py@@ -37,22 +37,34 @@ def write_config (prefix):      f.write("}") -def write_compile_parameters (prefix, dest, cc, gee, valac, non_null,-                              valacflags, cflags, ldflags, gtk):+def write_compile_parameters(prefix, dest, cc, gee, valac, pkg_config,+                             non_null, valacflags, cflags, ldflags, gtk):+    settings = {+        'prefix': prefix,+        'dest': dest,+        'cc': cc,+        'cflags': cflags,+        'ldflags': ldflags,+        'valac': valac,+        'valacflags': valacflags,+        'pkg-config': pkg_config,+        'non_null': '--enable-experimental-non-null' if non_null else '',+        'gee': gee,+    }+    def autoquote(v):+        if isinstance(v, str):+            return '"' + v + '"'+        else:+            return str(v)+     f = open('./scripts/config.py', 'w+')     f.write("#!/usr/bin/python3\n")-    f.write("PREFIX =  \"" + prefix + "\"\n")-    f.write("DEST = \"" + dest + "\"\n")-    f.write("CC = \"" + cc + "\"\n")-    f.write("GEE = \"" + gee + "\"\n")-    f.write("VALAC = \"" + valac + "\"\n")--    if non_null:-        f.write("NON_NULL = \"--enable-experimental-non-null\"\n")-    else:-        f.write("NON_NULL = \"\"\n")-        -    f.write("VALACFLAGS = " + str(valacflags) + "\n")-    f.write("CFLAGS = " + str(cflags) + "\n")-    f.write("LDFLAGS = " + str(ldflags) + "\n")+    for k, v in settings.items():+        f.write("%s = %s\n" % (k.upper().replace('-', '_'), autoquote(v)))+     f.write("GTK = " + str(gtk) + "\n")++    f.write("SETTINGS = {\n")+    for k, v in settings.items():+        f.write('    "%s": %s,\n' % (k, autoquote(v)))+    f.write("}\n")diff --git a/scripts/release.sh b/scripts/release.shindex c807b6c..98032e2 100755--- a/scripts/release.sh+++ b/scripts/release.sh@@ -15,9 +15,11 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>.  rep="$(pwd)"+repname="$(basename $(pwd))"  mkdir -p build cd build+rm -rf export mkdir -p export cd export  @@ -51,7 +53,7 @@ else 	git clone --depth 1 -b $1 file://$rep fi -mv birdfont birdfont-$version+mv $repname birdfont-$version  rm -rf birdfont-$version/.git rm -rf birdfont-$version/.gitignorediff --git a/scripts/snap.py b/scripts/snap.pynew file mode 100755index 0000000..dd1b886--- /dev/null+++ b/scripts/snap.py@@ -0,0 +1,37 @@+#!/usr/bin/python3+import version+from optparse import OptionParser++parser = OptionParser()+parser.add_option('-f', '--free', dest='free', action="store_true", help="generate non-commercial version")+(options, args) = parser.parse_args()++template = open('./scripts/snapcraft.yaml', 'r')+yaml = template.read();++if options.free:+	v = version.VERSION + "-free"+else:+	v = version.VERSION++yaml = yaml.replace("VERSION", v)++make_script = open('./build/snapsource/birdfont/Makefile', 'w+')+make_script.write("#Don't edit, the file is generated by a script\n")+make_script.write("all:\n")++if options.free:+    make_script.write ("\t./configure --valac-flags=\"-D FREE\"\n")+else:+    make_script.write ("\t./configure\n")++make_script.write("\t./build.py\n")+make_script.write("""++install:+	./install.py -d $(DESTDIR)+""")++build_script = open('./build/snapcraft.yaml', 'w+')+build_script.write(yaml)+diff --git a/scripts/snap.sh b/scripts/snap.shnew file mode 100755index 0000000..d08a3ab--- /dev/null+++ b/scripts/snap.sh@@ -0,0 +1,27 @@+#!/bin/sh++if ! git diff --exit-code > /dev/null; then+        echo "Uncommitted changes, commit before creating the release."+        exit 1+fi++SOURCE_DIR="$(pwd)"++rm -rf $SOURCE_DIR/build/snapsource+mkdir -p $SOURCE_DIR/build/snapsource && \+cd $SOURCE_DIR/build/snapsource && \+git clone --depth=1 file:///$SOURCE_DIR birdfont && \+cd $SOURCE_DIR/build/snapsource/birdfont && \+python3 ./scripts/complete_translations.py -t 93 -i && \+cd .. && \+cd .. && \+mkdir -p setup/gui && \+cp ../resources/linux/256x256/birdfont.png setup/gui/icon.png && \+cd .. && \+./scripts/snap.py --free && \+cd build && \+snapcraft snap && \+cd .. && \+./scripts/snap.py && \+cd build && \+snapcraft snapdiff --git a/scripts/snapcraft.yaml b/scripts/snapcraft.yamlnew file mode 100644index 0000000..656f3ad--- /dev/null+++ b/scripts/snapcraft.yaml@@ -0,0 +1,26 @@+name: birdfont+version: VERSION+summary: Font editor+description: A font edior which can create TTF, EOT and SVG fonts+confinement: strict++build-packages: [valac, python3, libglib2.0-dev, libgtk-3-dev,+ libwebkit2gtk-3.0-dev, libgee-0.8-dev, libnotify-dev, libsqlite3-dev, + libxmlbird-dev, python-pkg-resources]++apps: +  run: +    command: birdfont+    plugs: [home, gsettings, x11, unity7]++parts: +  birdfont: +    plugin: make+    source: snapsource/birdfont+    stage-packages:+      - libglib2.0-0+      - libwebkit2gtk-3.0-25+      - libgee-0.8-2+      - libnotify4+      - libsqlite3-0+      - libxmlbird1diff --git a/scripts/version.py b/scripts/version.pyindex 16cb94a..499d1e3 100644--- a/scripts/version.py+++ b/scripts/version.py@@ -1,6 +1,6 @@ #!/usr/bin/python3 """-Copyright (C) 2013 2014 2016 Johan Mattsson+Copyright (C) 2013, 2014 Johan Mattsson  This library is free software; you can redistribute it and/or modify  it under the terms of the GNU Lesser General Public License as @@ -13,15 +13,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. """ -VERSION = '2.15.3'+VERSION = '2.19.0' SO_VERSION_MAJOR = '36' SO_VERSION_MINOR = '0' SO_VERSION = SO_VERSION_MAJOR + '.' + SO_VERSION_MINOR  LIBBIRDGEMS_SO_VERSION_MAJOR = '0' LIBBIRDGEMS_SO_VERSION_MINOR = '0'-LIBBIRDGEMS_SO_VERSION = LIBBIRDGEMS_SO_VERSION_MAJOR + '.' + LIBBIRDGEMS_SO_VERSION_MINOR--LIBSVGBIRD_SO_VERSION_MAJOR = '0'-LIBSVGBIRD_SO_VERSION_MINOR = '0'-LIBSVGBIRD_SO_VERSION = LIBBIRDGEMS_SO_VERSION_MAJOR + '.' + LIBBIRDGEMS_SO_VERSION_MINOR+LIBBIRDGEMS_SO_VERSION = LIBBIRDGEMS_SO_VERSION_MAJOR + '.' + LIBBIRDGEMS_SO_VERSION_MINOR;diff --git a/webkit2gtk-3.0.deps b/webkit2gtk-3.0.depsnew file mode 100644index 0000000..91b1dfe--- /dev/null+++ b/webkit2gtk-3.0.deps@@ -0,0 +1,8 @@+atk+gio-2.0+cairo+pango+gdk-pixbuf-2.0+gdk-3.0+gtk+-3.0+libsoup-2.4diff --git a/webkit2gtk-3.0.vapi b/webkit2gtk-3.0.vapinew file mode 100644index 0000000..ba300a8--- /dev/null+++ b/webkit2gtk-3.0.vapi@@ -0,0 +1,4817 @@+/* webkit-1.0.vapi generated by vapigen, do not modify. */++[CCode (lower_case_cprefix = "webkit_")]+namespace WebKit {+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMAttr : WebKit.DOMNode, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMAttr ();+		public bool get_is_id ();+		public unowned string get_name ();+		public unowned WebKit.DOMElement get_owner_element ();+		public bool get_specified ();+		public unowned string get_value ();+		public void set_value (string value) throws GLib.Error;+		public bool is_id { get; }+		public string name { get; }+		public WebKit.DOMElement owner_element { get; }+		public bool specified { get; }+		public string value { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMBarInfo : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMBarInfo ();+		public bool get_visible ();+		public bool visible { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMBlob : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMBlob ();+		public uint64 get_size ();+		public unowned WebKit.DOMBlob slice (int64 start, int64 end, string content_type);+		public unowned WebKit.DOMBlob webkit_slice (int64 start, int64 end, string content_type);+		public uint64 size { get; }+		[NoAccessorMethod]+		public string type { owned get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMCDATASection : WebKit.DOMText, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMCDATASection ();+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMCSSRule : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMCSSRule ();+		[CCode (cname = "webkit_dom_css_rule_get_css_text")]+		public unowned string get_css_text ();+		[CCode (cname = "webkit_dom_css_rule_get_parent_rule")]+		public unowned WebKit.DOMCSSRule get_parent_rule ();+		[CCode (cname = "webkit_dom_css_rule_get_parent_style_sheet")]+		public unowned WebKit.DOMCSSStyleSheet get_parent_style_sheet ();+		[CCode (cname = "webkit_dom_css_rule_set_css_text")]+		public void set_css_text (string value) throws GLib.Error;+		public string css_text { get; set; }+		public WebKit.DOMCSSRule parent_rule { get; }+		public WebKit.DOMCSSStyleSheet parent_style_sheet { get; }+		[NoAccessorMethod]+		public uint type { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMCSSRuleList : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMCSSRuleList ();+		[CCode (cname = "webkit_dom_css_rule_list_get_length")]+		public ulong get_length ();+		[CCode (cname = "webkit_dom_css_rule_list_item")]+		public unowned WebKit.DOMCSSRule item (ulong index);+		public ulong length { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMCSSStyleDeclaration : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMCSSStyleDeclaration ();+		[CCode (cname = "webkit_dom_css_style_declaration_get_css_text")]+		public unowned string get_css_text ();+		[CCode (cname = "webkit_dom_css_style_declaration_get_length")]+		public ulong get_length ();+		[CCode (cname = "webkit_dom_css_style_declaration_get_parent_rule")]+		public unowned WebKit.DOMCSSRule get_parent_rule ();+		[CCode (cname = "webkit_dom_css_style_declaration_get_property_css_value")]+		public unowned WebKit.DOMCSSValue get_property_css_value (string property_name);+		[CCode (cname = "webkit_dom_css_style_declaration_get_property_priority")]+		public unowned string get_property_priority (string property_name);+		[CCode (cname = "webkit_dom_css_style_declaration_get_property_shorthand")]+		public unowned string get_property_shorthand (string property_name);+		[CCode (cname = "webkit_dom_css_style_declaration_get_property_value")]+		public unowned string get_property_value (string property_name);+		[CCode (cname = "webkit_dom_css_style_declaration_is_property_implicit")]+		public bool is_property_implicit (string property_name);+		[CCode (cname = "webkit_dom_css_style_declaration_item")]+		public unowned string item (ulong index);+		[CCode (cname = "webkit_dom_css_style_declaration_remove_property")]+		public unowned string remove_property (string property_name) throws GLib.Error;+		[CCode (cname = "webkit_dom_css_style_declaration_set_css_text")]+		public void set_css_text (string value) throws GLib.Error;+		[CCode (cname = "webkit_dom_css_style_declaration_set_property")]+		public void set_property (string property_name, string value, string priority) throws GLib.Error;+		public string css_text { get; set; }+		public ulong length { get; }+		public WebKit.DOMCSSRule parent_rule { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMCSSStyleSheet : WebKit.DOMStyleSheet {+		[CCode (has_construct_function = false)]+		protected DOMCSSStyleSheet ();+		[CCode (cname = "webkit_dom_css_style_sheet_add_rule")]+		public long add_rule (string selector, string style, ulong index) throws GLib.Error;+		[CCode (cname = "webkit_dom_css_style_sheet_delete_rule")]+		public void delete_rule (ulong index) throws GLib.Error;+		[CCode (cname = "webkit_dom_css_style_sheet_get_css_rules")]+		public unowned WebKit.DOMCSSRuleList get_css_rules ();+		[CCode (cname = "webkit_dom_css_style_sheet_get_owner_rule")]+		public unowned WebKit.DOMCSSRule get_owner_rule ();+		[CCode (cname = "webkit_dom_css_style_sheet_get_rules")]+		public unowned WebKit.DOMCSSRuleList get_rules ();+		[CCode (cname = "webkit_dom_css_style_sheet_insert_rule")]+		public ulong insert_rule (string rule, ulong index) throws GLib.Error;+		[CCode (cname = "webkit_dom_css_style_sheet_remove_rule")]+		public void remove_rule (ulong index) throws GLib.Error;+		public WebKit.DOMCSSRuleList css_rules { get; }+		public WebKit.DOMCSSRule owner_rule { get; }+		public WebKit.DOMCSSRuleList rules { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMCSSValue : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMCSSValue ();+		[CCode (cname = "webkit_dom_css_value_get_css_text")]+		public unowned string get_css_text ();+		[CCode (cname = "webkit_dom_css_value_get_css_value_type")]+		public ushort get_css_value_type ();+		[CCode (cname = "webkit_dom_css_value_set_css_text")]+		public void set_css_text (string value) throws GLib.Error;+		public string css_text { get; set; }+		public uint css_value_type { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMCharacterData : WebKit.DOMNode, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMCharacterData ();+		public void append_data (string data) throws GLib.Error;+		public void delete_data (ulong offset, ulong length) throws GLib.Error;+		public unowned string get_data ();+		public ulong get_length ();+		public void insert_data (ulong offset, string data) throws GLib.Error;+		public void replace_data (ulong offset, ulong length, string data) throws GLib.Error;+		public void set_data (string value) throws GLib.Error;+		public unowned string substring_data (ulong offset, ulong length) throws GLib.Error;+		public string data { get; set; }+		public ulong length { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMComment : WebKit.DOMCharacterData, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMComment ();+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMConsole : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMConsole ();+		public unowned WebKit.DOMMemoryInfo get_memory ();+		public void group_end ();+		public void time (string title);+		public WebKit.DOMMemoryInfo memory { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	[Compact]+	public class DOMCustom {+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	[Compact]+	public class DOMCustomClass {+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDOMApplicationCache : WebKit.DOMObject, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMDOMApplicationCache ();+		[CCode (cname = "webkit_dom_dom_application_cache_get_status")]+		public ushort get_status ();+		[CCode (cname = "webkit_dom_dom_application_cache_swap_cache")]+		public void swap_cache () throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_application_cache_update")]+		public void update () throws GLib.Error;+		public uint status { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDOMImplementation : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMDOMImplementation ();+		[CCode (cname = "webkit_dom_dom_implementation_create_css_style_sheet")]+		public unowned WebKit.DOMCSSStyleSheet create_css_style_sheet (string title, string media) throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_implementation_create_document")]+		public unowned WebKit.DOMDocument create_document (string namespace_uri, string qualified_name, WebKit.DOMDocumentType doctype) throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_implementation_create_document_type")]+		public unowned WebKit.DOMDocumentType create_document_type (string qualified_name, string public_id, string system_id) throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_implementation_create_html_document")]+		public unowned WebKit.DOMHTMLDocument create_html_document (string title);+		[CCode (cname = "webkit_dom_dom_implementation_has_feature")]+		public bool has_feature (string feature, string version);+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDOMMimeType : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMDOMMimeType ();+		[CCode (cname = "webkit_dom_dom_mime_type_get_description")]+		public unowned string get_description ();+		[CCode (cname = "webkit_dom_dom_mime_type_get_enabled_plugin")]+		public unowned WebKit.DOMDOMPlugin get_enabled_plugin ();+		[CCode (cname = "webkit_dom_dom_mime_type_get_suffixes")]+		public unowned string get_suffixes ();+		public string description { get; }+		public WebKit.DOMDOMPlugin enabled_plugin { get; }+		public string suffixes { get; }+		[NoAccessorMethod]+		public string type { owned get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDOMMimeTypeArray : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMDOMMimeTypeArray ();+		[CCode (cname = "webkit_dom_dom_mime_type_array_get_length")]+		public ulong get_length ();+		[CCode (cname = "webkit_dom_dom_mime_type_array_item")]+		public unowned WebKit.DOMDOMMimeType item (ulong index);+		[CCode (cname = "webkit_dom_dom_mime_type_array_named_item")]+		public unowned WebKit.DOMDOMMimeType named_item (string name);+		public ulong length { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDOMPlugin : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMDOMPlugin ();+		[CCode (cname = "webkit_dom_dom_plugin_get_description")]+		public unowned string get_description ();+		[CCode (cname = "webkit_dom_dom_plugin_get_filename")]+		public unowned string get_filename ();+		[CCode (cname = "webkit_dom_dom_plugin_get_length")]+		public ulong get_length ();+		[CCode (cname = "webkit_dom_dom_plugin_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_dom_plugin_item")]+		public unowned WebKit.DOMDOMMimeType item (ulong index);+		[CCode (cname = "webkit_dom_dom_plugin_named_item")]+		public unowned WebKit.DOMDOMMimeType named_item (string name);+		public string description { get; }+		public string filename { get; }+		public ulong length { get; }+		public string name { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDOMPluginArray : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMDOMPluginArray ();+		[CCode (cname = "webkit_dom_dom_plugin_array_get_length")]+		public ulong get_length ();+		[CCode (cname = "webkit_dom_dom_plugin_array_item")]+		public unowned WebKit.DOMDOMPlugin item (ulong index);+		[CCode (cname = "webkit_dom_dom_plugin_array_named_item")]+		public unowned WebKit.DOMDOMPlugin named_item (string name);+		[CCode (cname = "webkit_dom_dom_plugin_array_refresh")]+		public void refresh (bool reload);+		public ulong length { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDOMSelection : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMDOMSelection ();+		[CCode (cname = "webkit_dom_dom_selection_add_range")]+		public void add_range (WebKit.DOMRange range);+		[CCode (cname = "webkit_dom_dom_selection_collapse")]+		public void collapse (WebKit.DOMNode node, long index) throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_selection_collapse_to_end")]+		public void collapse_to_end () throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_selection_collapse_to_start")]+		public void collapse_to_start () throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_selection_contains_node")]+		public bool contains_node (WebKit.DOMNode node, bool allow_partial);+		[CCode (cname = "webkit_dom_dom_selection_delete_from_document")]+		public void delete_from_document ();+		[CCode (cname = "webkit_dom_dom_selection_empty")]+		public void empty ();+		[CCode (cname = "webkit_dom_dom_selection_extend")]+		public void extend (WebKit.DOMNode node, long offset) throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_selection_get_anchor_node")]+		public unowned WebKit.DOMNode get_anchor_node ();+		[CCode (cname = "webkit_dom_dom_selection_get_anchor_offset")]+		public long get_anchor_offset ();+		[CCode (cname = "webkit_dom_dom_selection_get_base_node")]+		public unowned WebKit.DOMNode get_base_node ();+		[CCode (cname = "webkit_dom_dom_selection_get_base_offset")]+		public long get_base_offset ();+		[CCode (cname = "webkit_dom_dom_selection_get_extent_node")]+		public unowned WebKit.DOMNode get_extent_node ();+		[CCode (cname = "webkit_dom_dom_selection_get_extent_offset")]+		public long get_extent_offset ();+		[CCode (cname = "webkit_dom_dom_selection_get_focus_node")]+		public unowned WebKit.DOMNode get_focus_node ();+		[CCode (cname = "webkit_dom_dom_selection_get_focus_offset")]+		public long get_focus_offset ();+		[CCode (cname = "webkit_dom_dom_selection_get_is_collapsed")]+		public bool get_is_collapsed ();+		[CCode (cname = "webkit_dom_dom_selection_get_range_at")]+		public unowned WebKit.DOMRange get_range_at (long index) throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_selection_get_range_count")]+		public long get_range_count ();+		[CCode (cname = "webkit_dom_dom_selection_modify")]+		public void modify (string alter, string direction, string granularity);+		[CCode (cname = "webkit_dom_dom_selection_remove_all_ranges")]+		public void remove_all_ranges ();+		[CCode (cname = "webkit_dom_dom_selection_select_all_children")]+		public void select_all_children (WebKit.DOMNode node) throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_selection_set_base_and_extent")]+		public void set_base_and_extent (WebKit.DOMNode base_node, long base_offset, WebKit.DOMNode extent_node, long extent_offset) throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_selection_set_position")]+		public void set_position (WebKit.DOMNode node, long offset) throws GLib.Error;+		public WebKit.DOMNode anchor_node { get; }+		public long anchor_offset { get; }+		public WebKit.DOMNode base_node { get; }+		public long base_offset { get; }+		public WebKit.DOMNode extent_node { get; }+		public long extent_offset { get; }+		public WebKit.DOMNode focus_node { get; }+		public long focus_offset { get; }+		public bool is_collapsed { get; }+		public long range_count { get; }+		[NoAccessorMethod]+		public string type { owned get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDOMSettableTokenList : WebKit.DOMDOMTokenList {+		[CCode (has_construct_function = false)]+		protected DOMDOMSettableTokenList ();+		[CCode (cname = "webkit_dom_dom_settable_token_list_get_value")]+		public unowned string get_value ();+		[CCode (cname = "webkit_dom_dom_settable_token_list_set_value")]+		public void set_value (string value);+		public string value { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDOMStringList : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMDOMStringList ();+		[CCode (cname = "webkit_dom_dom_string_list_contains")]+		public bool contains (string str);+		[CCode (cname = "webkit_dom_dom_string_list_get_length")]+		public ulong get_length ();+		[CCode (cname = "webkit_dom_dom_string_list_item")]+		public unowned string item (ulong index);+		public ulong length { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDOMStringMap : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMDOMStringMap ();+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDOMTokenList : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMDOMTokenList ();+		[CCode (cname = "webkit_dom_dom_token_list_add")]+		public void add (string token) throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_token_list_contains")]+		public bool contains (string token) throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_token_list_get_length")]+		public ulong get_length ();+		[CCode (cname = "webkit_dom_dom_token_list_item")]+		public unowned string item (ulong index);+		[CCode (cname = "webkit_dom_dom_token_list_remove")]+		public void remove (string token) throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_token_list_toggle")]+		public bool toggle (string token) throws GLib.Error;+		public ulong length { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDOMWindow : WebKit.DOMObject, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMDOMWindow ();+		[CCode (cname = "webkit_dom_dom_window_alert")]+		public void alert (string message);+		[CCode (cname = "webkit_dom_dom_window_atob")]+		public unowned string atob (string str) throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_window_blur")]+		public void blur ();+		[CCode (cname = "webkit_dom_dom_window_btoa")]+		public unowned string btoa (string str) throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_window_capture_events")]+		public void capture_events ();+		[CCode (cname = "webkit_dom_dom_window_clear_interval")]+		public void clear_interval (long handle);+		[CCode (cname = "webkit_dom_dom_window_clear_timeout")]+		public void clear_timeout (long handle);+		[CCode (cname = "webkit_dom_dom_window_close")]+		public void close ();+		[CCode (cname = "webkit_dom_dom_window_confirm")]+		public bool confirm (string message);+		[CCode (cname = "webkit_dom_dom_window_find")]+		public bool find (string str, bool case_sensitive, bool backwards, bool wrap, bool whole_word, bool search_in_frames, bool show_dialog);+		[CCode (cname = "webkit_dom_dom_window_focus")]+		public void focus ();+		[CCode (cname = "webkit_dom_dom_window_get_application_cache")]+		public unowned WebKit.DOMDOMApplicationCache get_application_cache ();+		[CCode (cname = "webkit_dom_dom_window_get_client_information")]+		public unowned WebKit.DOMNavigator get_client_information ();+		[CCode (cname = "webkit_dom_dom_window_get_closed")]+		public bool get_closed ();+		[CCode (cname = "webkit_dom_dom_window_get_computed_style")]+		public unowned WebKit.DOMCSSStyleDeclaration get_computed_style (WebKit.DOMElement element, string pseudo_element);+		[CCode (cname = "webkit_dom_dom_window_get_console")]+		public unowned WebKit.DOMConsole get_console ();+		[CCode (cname = "webkit_dom_dom_window_get_default_status")]+		public unowned string get_default_status ();+		[CCode (cname = "webkit_dom_dom_window_get_device_pixel_ratio")]+		public double get_device_pixel_ratio ();+		[CCode (cname = "webkit_dom_dom_window_get_document")]+		public unowned WebKit.DOMDocument get_document ();+		[CCode (cname = "webkit_dom_dom_window_get_frame_element")]+		public unowned WebKit.DOMElement get_frame_element ();+		[CCode (cname = "webkit_dom_dom_window_get_frames")]+		public unowned WebKit.DOMDOMWindow get_frames ();+		[CCode (cname = "webkit_dom_dom_window_get_history")]+		public unowned WebKit.DOMHistory get_history ();+		[CCode (cname = "webkit_dom_dom_window_get_inner_height")]+		public long get_inner_height ();+		[CCode (cname = "webkit_dom_dom_window_get_inner_width")]+		public long get_inner_width ();+		[CCode (cname = "webkit_dom_dom_window_get_length")]+		public ulong get_length ();+		[CCode (cname = "webkit_dom_dom_window_get_local_storage")]+		public unowned WebKit.DOMStorage get_local_storage () throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_window_get_locationbar")]+		public unowned WebKit.DOMBarInfo get_locationbar ();+		[CCode (cname = "webkit_dom_dom_window_get_menubar")]+		public unowned WebKit.DOMBarInfo get_menubar ();+		[CCode (cname = "webkit_dom_dom_window_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_dom_window_get_navigator")]+		public unowned WebKit.DOMNavigator get_navigator ();+		[CCode (cname = "webkit_dom_dom_window_get_offscreen_buffering")]+		public bool get_offscreen_buffering ();+		[CCode (cname = "webkit_dom_dom_window_get_opener")]+		public unowned WebKit.DOMDOMWindow get_opener ();+		[CCode (cname = "webkit_dom_dom_window_get_outer_height")]+		public long get_outer_height ();+		[CCode (cname = "webkit_dom_dom_window_get_outer_width")]+		public long get_outer_width ();+		[CCode (cname = "webkit_dom_dom_window_get_page_x_offset")]+		public long get_page_x_offset ();+		[CCode (cname = "webkit_dom_dom_window_get_page_y_offset")]+		public long get_page_y_offset ();+		[CCode (cname = "webkit_dom_dom_window_get_parent")]+		public unowned WebKit.DOMDOMWindow get_parent ();+		[CCode (cname = "webkit_dom_dom_window_get_personalbar")]+		public unowned WebKit.DOMBarInfo get_personalbar ();+		[CCode (cname = "webkit_dom_dom_window_get_screen")]+		public unowned WebKit.DOMScreen get_screen ();+		[CCode (cname = "webkit_dom_dom_window_get_screen_left")]+		public long get_screen_left ();+		[CCode (cname = "webkit_dom_dom_window_get_screen_top")]+		public long get_screen_top ();+		[CCode (cname = "webkit_dom_dom_window_get_screen_x")]+		public long get_screen_x ();+		[CCode (cname = "webkit_dom_dom_window_get_screen_y")]+		public long get_screen_y ();+		[CCode (cname = "webkit_dom_dom_window_get_scroll_x")]+		public long get_scroll_x ();+		[CCode (cname = "webkit_dom_dom_window_get_scroll_y")]+		public long get_scroll_y ();+		[CCode (cname = "webkit_dom_dom_window_get_scrollbars")]+		public unowned WebKit.DOMBarInfo get_scrollbars ();+		[CCode (cname = "webkit_dom_dom_window_get_selection")]+		public unowned WebKit.DOMDOMSelection get_selection ();+		[CCode (cname = "webkit_dom_dom_window_get_self")]+		public unowned WebKit.DOMDOMWindow get_self ();+		[CCode (cname = "webkit_dom_dom_window_get_session_storage")]+		public unowned WebKit.DOMStorage get_session_storage () throws GLib.Error;+		[CCode (cname = "webkit_dom_dom_window_get_status")]+		public unowned string get_status ();+		[CCode (cname = "webkit_dom_dom_window_get_statusbar")]+		public unowned WebKit.DOMBarInfo get_statusbar ();+		[CCode (cname = "webkit_dom_dom_window_get_style_media")]+		public unowned WebKit.DOMStyleMedia get_style_media ();+		[CCode (cname = "webkit_dom_dom_window_get_toolbar")]+		public unowned WebKit.DOMBarInfo get_toolbar ();+		[CCode (cname = "webkit_dom_dom_window_get_top")]+		public unowned WebKit.DOMDOMWindow get_top ();+		[CCode (cname = "webkit_dom_dom_window_get_window")]+		public unowned WebKit.DOMDOMWindow get_window ();+		[CCode (cname = "webkit_dom_dom_window_match_media")]+		public unowned WebKit.DOMMediaQueryList match_media (string query);+		[CCode (cname = "webkit_dom_dom_window_move_by")]+		public void move_by (float x, float y);+		[CCode (cname = "webkit_dom_dom_window_move_to")]+		public void move_to (float x, float y);+		[CCode (cname = "webkit_dom_dom_window_print")]+		public void print ();+		[CCode (cname = "webkit_dom_dom_window_prompt")]+		public unowned string prompt (string message, string default_value);+		[CCode (cname = "webkit_dom_dom_window_release_events")]+		public void release_events ();+		[CCode (cname = "webkit_dom_dom_window_resize_by")]+		public void resize_by (float x, float y);+		[CCode (cname = "webkit_dom_dom_window_resize_to")]+		public void resize_to (float width, float height);+		[CCode (cname = "webkit_dom_dom_window_scroll")]+		public void scroll (long x, long y);+		[CCode (cname = "webkit_dom_dom_window_scroll_by")]+		public void scroll_by (long x, long y);+		[CCode (cname = "webkit_dom_dom_window_scroll_to")]+		public void scroll_to (long x, long y);+		[CCode (cname = "webkit_dom_dom_window_set_default_status")]+		public void set_default_status (string value);+		[CCode (cname = "webkit_dom_dom_window_set_name")]+		public void set_name (string value);+		[CCode (cname = "webkit_dom_dom_window_set_status")]+		public void set_status (string value);+		[CCode (cname = "webkit_dom_dom_window_stop")]+		public void stop ();+		[CCode (cname = "webkit_dom_dom_window_webkit_convert_point_from_node_to_page")]+		public unowned WebKit.DOMWebKitPoint webkit_convert_point_from_node_to_page (WebKit.DOMNode node, WebKit.DOMWebKitPoint p);+		[CCode (cname = "webkit_dom_dom_window_webkit_convert_point_from_page_to_node")]+		public unowned WebKit.DOMWebKitPoint webkit_convert_point_from_page_to_node (WebKit.DOMNode node, WebKit.DOMWebKitPoint p);+		public WebKit.DOMDOMApplicationCache application_cache { get; }+		[NoAccessorMethod]+		public WebKit.DOMNavigator client_information { owned get; set; }+		public bool closed { get; }+		[NoAccessorMethod]+		public WebKit.DOMConsole console { owned get; set; }+		public string default_status { get; set; }+		[NoAccessorMethod]+		public double device_pixel_ratio { get; set; }+		public WebKit.DOMDocument document { get; }+		public WebKit.DOMElement frame_element { get; }+		[NoAccessorMethod]+		public WebKit.DOMDOMWindow frames { owned get; set; }+		[NoAccessorMethod]+		public WebKit.DOMHistory history { owned get; set; }+		[NoAccessorMethod]+		public long inner_height { get; set; }+		[NoAccessorMethod]+		public long inner_width { get; set; }+		[NoAccessorMethod]+		public ulong length { get; set; }+		public WebKit.DOMStorage local_storage { get; }+		[NoAccessorMethod]+		public WebKit.DOMBarInfo locationbar { owned get; set; }+		[NoAccessorMethod]+		public WebKit.DOMBarInfo menubar { owned get; set; }+		public string name { get; set; }+		[NoAccessorMethod]+		public WebKit.DOMNavigator navigator { owned get; set; }+		[NoAccessorMethod]+		public bool offscreen_buffering { get; set; }+		[NoAccessorMethod]+		public WebKit.DOMDOMWindow opener { owned get; set; }+		[NoAccessorMethod]+		public long outer_height { get; set; }+		[NoAccessorMethod]+		public long outer_width { get; set; }+		public long page_x_offset { get; }+		public long page_y_offset { get; }+		[NoAccessorMethod]+		public WebKit.DOMDOMWindow parent { owned get; set; }+		[NoAccessorMethod]+		public WebKit.DOMBarInfo personalbar { owned get; set; }+		[NoAccessorMethod]+		public WebKit.DOMScreen screen { owned get; set; }+		[NoAccessorMethod]+		public long screen_left { get; set; }+		[NoAccessorMethod]+		public long screen_top { get; set; }+		[NoAccessorMethod]+		public long screen_x { get; set; }+		[NoAccessorMethod]+		public long screen_y { get; set; }+		[NoAccessorMethod]+		public long scroll_x { get; set; }+		[NoAccessorMethod]+		public long scroll_y { get; set; }+		[NoAccessorMethod]+		public WebKit.DOMBarInfo scrollbars { owned get; set; }+		[NoAccessorMethod]+		public WebKit.DOMDOMWindow self { owned get; set; }+		public WebKit.DOMStorage session_storage { get; }+		public string status { get; set; }+		[NoAccessorMethod]+		public WebKit.DOMBarInfo statusbar { owned get; set; }+		public WebKit.DOMStyleMedia style_media { get; }+		[NoAccessorMethod]+		public WebKit.DOMBarInfo toolbar { owned get; set; }+		[NoAccessorMethod]+		public WebKit.DOMDOMWindow top { owned get; set; }+		public WebKit.DOMDOMWindow window { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDatabase : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMDatabase ();+		public unowned string get_version ();+		public string version { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDocument : WebKit.DOMNode, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMDocument ();+		public unowned WebKit.DOMNode adopt_node (WebKit.DOMNode source) throws GLib.Error;+		public unowned WebKit.DOMRange caret_range_from_point (long x, long y);+		public unowned WebKit.DOMAttr create_attribute (string name) throws GLib.Error;+		public unowned WebKit.DOMAttr create_attribute_ns (string namespace_uri, string qualified_name) throws GLib.Error;+		public unowned WebKit.DOMCDATASection create_cdata_section (string data) throws GLib.Error;+		public unowned WebKit.DOMComment create_comment (string data);+		public unowned WebKit.DOMCSSStyleDeclaration create_css_style_declaration ();+		public unowned WebKit.DOMDocumentFragment create_document_fragment ();+		public unowned WebKit.DOMElement create_element (string tag_name) throws GLib.Error;+		public unowned WebKit.DOMElement create_element_ns (string namespace_uri, string qualified_name) throws GLib.Error;+		public unowned WebKit.DOMEntityReference create_entity_reference (string name) throws GLib.Error;+		public unowned WebKit.DOMEvent create_event (string event_type) throws GLib.Error;+		public unowned WebKit.DOMXPathExpression create_expression (string expression, WebKit.DOMXPathNSResolver resolver) throws GLib.Error;+		public unowned WebKit.DOMNodeIterator create_node_iterator (WebKit.DOMNode root, ulong what_to_show, WebKit.DOMNodeFilter filter, bool expand_entity_references) throws GLib.Error;+		public unowned WebKit.DOMXPathNSResolver create_ns_resolver (WebKit.DOMNode node_resolver);+		public unowned WebKit.DOMProcessingInstruction create_processing_instruction (string target, string data) throws GLib.Error;+		public unowned WebKit.DOMRange create_range ();+		public unowned WebKit.DOMText create_text_node (string data);+		public unowned WebKit.DOMTreeWalker create_tree_walker (WebKit.DOMNode root, ulong what_to_show, WebKit.DOMNodeFilter filter, bool expand_entity_references) throws GLib.Error;+		public unowned WebKit.DOMElement element_from_point (long x, long y);+		public unowned WebKit.DOMXPathResult evaluate (string expression, WebKit.DOMNode context_node, WebKit.DOMXPathNSResolver resolver, ushort type, WebKit.DOMXPathResult in_result) throws GLib.Error;+		public bool exec_command (string command, bool user_interface, string value);+		public unowned WebKit.DOMHTMLCollection get_anchors ();+		public unowned WebKit.DOMHTMLCollection get_applets ();+		public unowned WebKit.DOMHTMLElement get_body ();+		public unowned string get_character_set ();+		public unowned string get_charset ();+		public unowned string get_compat_mode ();+		public unowned string get_cookie () throws GLib.Error;+		public unowned string get_default_charset ();+		public unowned WebKit.DOMDOMWindow get_default_view ();+		public unowned WebKit.DOMDocumentType get_doctype ();+		public unowned WebKit.DOMElement get_document_element ();+		public unowned string get_document_uri ();+		public unowned string get_domain ();+		public unowned WebKit.DOMElement get_element_by_id (string element_id);+		public unowned WebKit.DOMNodeList get_elements_by_class_name (string tagname);+		public unowned WebKit.DOMNodeList get_elements_by_name (string element_name);+		public unowned WebKit.DOMNodeList get_elements_by_tag_name (string tagname);+		public unowned WebKit.DOMNodeList get_elements_by_tag_name_ns (string namespace_uri, string local_name);+		public unowned WebKit.DOMHTMLCollection get_forms ();+		public unowned WebKit.DOMHTMLHeadElement get_head ();+		public unowned WebKit.DOMHTMLCollection get_images ();+		public unowned WebKit.DOMDOMImplementation get_implementation ();+		public unowned string get_input_encoding ();+		public unowned string get_last_modified ();+		public unowned WebKit.DOMHTMLCollection get_links ();+		public unowned WebKit.DOMCSSStyleDeclaration get_override_style (WebKit.DOMElement element, string pseudo_element);+		public unowned string get_preferred_stylesheet_set ();+		public unowned string get_ready_state ();+		public unowned string get_referrer ();+		public unowned string get_selected_stylesheet_set ();+		public unowned WebKit.DOMStyleSheetList get_style_sheets ();+		public unowned string get_title ();+		public unowned WebKit.DOMElement get_webkit_current_full_screen_element ();+		public bool get_webkit_full_screen_keyboard_input_allowed ();+		public bool get_webkit_hidden ();+		public bool get_webkit_is_full_screen ();+		public unowned string get_webkit_visibility_state ();+		public unowned string get_xml_encoding ();+		public bool get_xml_standalone ();+		public unowned string get_xml_version ();+		public unowned WebKit.DOMNode import_node (WebKit.DOMNode imported_node, bool deep) throws GLib.Error;+		public bool query_command_enabled (string command);+		public bool query_command_indeterm (string command);+		public bool query_command_state (string command);+		public bool query_command_supported (string command);+		public unowned string query_command_value (string command);+		public unowned WebKit.DOMElement query_selector (string selectors) throws GLib.Error;+		public unowned WebKit.DOMNodeList query_selector_all (string selectors) throws GLib.Error;+		public void set_body (WebKit.DOMHTMLElement value) throws GLib.Error;+		public void set_charset (string value);+		public void set_cookie (string value) throws GLib.Error;+		public void set_document_uri (string value);+		public void set_selected_stylesheet_set (string value);+		public void set_title (string value);+		public void set_xml_standalone (bool value) throws GLib.Error;+		public void set_xml_version (string value) throws GLib.Error;+		public void webkit_cancel_full_screen ();+		public WebKit.DOMHTMLCollection anchors { get; }+		public WebKit.DOMHTMLCollection applets { get; }+		public WebKit.DOMHTMLElement body { get; set; }+		public string character_set { get; }+		public string charset { get; set; }+		public string compat_mode { get; }+		public string cookie { get; set; }+		public string default_charset { get; }+		public WebKit.DOMDOMWindow default_view { get; }+		public WebKit.DOMDocumentType doctype { get; }+		public WebKit.DOMElement document_element { get; }+		public string document_uri { get; set; }+		public string domain { get; }+		public WebKit.DOMHTMLCollection forms { get; }+		public WebKit.DOMHTMLHeadElement head { get; }+		public WebKit.DOMHTMLCollection images { get; }+		public WebKit.DOMDOMImplementation implementation { get; }+		public string input_encoding { get; }+		public string last_modified { get; }+		public WebKit.DOMHTMLCollection links { get; }+		public string preferred_stylesheet_set { get; }+		public string ready_state { get; }+		public string referrer { get; }+		public string selected_stylesheet_set { get; set; }+		public WebKit.DOMStyleSheetList style_sheets { get; }+		public string title { get; set; }+		[NoAccessorMethod]+		public string url { owned get; }+		public WebKit.DOMElement webkit_current_full_screen_element { get; }+		public bool webkit_full_screen_keyboard_input_allowed { get; }+		public bool webkit_is_full_screen { get; }+		public string xml_encoding { get; }+		public bool xml_standalone { get; set; }+		public string xml_version { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDocumentFragment : WebKit.DOMNode, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMDocumentFragment ();+		public unowned WebKit.DOMElement query_selector (string selectors) throws GLib.Error;+		public unowned WebKit.DOMNodeList query_selector_all (string selectors) throws GLib.Error;+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMDocumentType : WebKit.DOMNode, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMDocumentType ();+		public unowned WebKit.DOMNamedNodeMap get_entities ();+		public unowned string get_internal_subset ();+		public unowned string get_name ();+		public unowned WebKit.DOMNamedNodeMap get_notations ();+		public unowned string get_public_id ();+		public unowned string get_system_id ();+		public WebKit.DOMNamedNodeMap entities { get; }+		public string internal_subset { get; }+		public string name { get; }+		public WebKit.DOMNamedNodeMap notations { get; }+		public string public_id { get; }+		public string system_id { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMElement : WebKit.DOMNode, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMElement ();+		public void blur ();+		public void focus ();+		public unowned string get_attribute (string name);+		public unowned WebKit.DOMAttr get_attribute_node (string name);+		public unowned WebKit.DOMAttr get_attribute_node_ns (string namespace_uri, string local_name);+		public unowned string get_attribute_ns (string namespace_uri, string local_name);+		public ulong get_child_element_count ();+		public long get_client_height ();+		public long get_client_left ();+		public long get_client_top ();+		public long get_client_width ();+		public unowned WebKit.DOMNodeList get_elements_by_class_name (string name);+		public unowned WebKit.DOMNodeList get_elements_by_tag_name (string name);+		public unowned WebKit.DOMNodeList get_elements_by_tag_name_ns (string namespace_uri, string local_name);+		public unowned WebKit.DOMElement get_first_element_child ();+		public unowned WebKit.DOMElement get_last_element_child ();+		public unowned WebKit.DOMElement get_next_element_sibling ();+		public long get_offset_height ();+		public long get_offset_left ();+		public unowned WebKit.DOMElement get_offset_parent ();+		public long get_offset_top ();+		public long get_offset_width ();+		public unowned WebKit.DOMElement get_previous_element_sibling ();+		public long get_scroll_height ();+		public long get_scroll_left ();+		public long get_scroll_top ();+		public long get_scroll_width ();+		public unowned WebKit.DOMCSSStyleDeclaration get_style ();+		public unowned string get_tag_name ();+		public bool has_attribute (string name);+		public bool has_attribute_ns (string namespace_uri, string local_name);+		public unowned WebKit.DOMElement query_selector (string selectors) throws GLib.Error;+		public unowned WebKit.DOMNodeList query_selector_all (string selectors) throws GLib.Error;+		public void remove_attribute (string name) throws GLib.Error;+		public unowned WebKit.DOMAttr remove_attribute_node (WebKit.DOMAttr old_attr) throws GLib.Error;+		public void remove_attribute_ns (string namespace_uri, string local_name) throws GLib.Error;+		public void scroll_by_lines (long lines);+		public void scroll_by_pages (long pages);+		public void scroll_into_view (bool align_with_top);+		public void scroll_into_view_if_needed (bool center_if_needed);+		public void set_attribute (string name, string value) throws GLib.Error;+		public unowned WebKit.DOMAttr set_attribute_node (WebKit.DOMAttr new_attr) throws GLib.Error;+		public unowned WebKit.DOMAttr set_attribute_node_ns (WebKit.DOMAttr new_attr) throws GLib.Error;+		public void set_attribute_ns (string namespace_uri, string qualified_name, string value) throws GLib.Error;+		public void set_scroll_left (long value);+		public void set_scroll_top (long value);+		public bool webkit_matches_selector (string selectors) throws GLib.Error;+		public void webkit_request_full_screen (ushort flags);+		public ulong child_element_count { get; }+		public long client_height { get; }+		public long client_left { get; }+		public long client_top { get; }+		public long client_width { get; }+		public WebKit.DOMElement first_element_child { get; }+		public WebKit.DOMElement last_element_child { get; }+		public WebKit.DOMElement next_element_sibling { get; }+		public long offset_height { get; }+		public long offset_left { get; }+		public WebKit.DOMElement offset_parent { get; }+		public long offset_top { get; }+		public long offset_width { get; }+		public WebKit.DOMElement previous_element_sibling { get; }+		public long scroll_height { get; }+		public long scroll_left { get; set; }+		public long scroll_top { get; set; }+		public long scroll_width { get; }+		public WebKit.DOMCSSStyleDeclaration style { get; }+		public string tag_name { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMEntityReference : WebKit.DOMNode, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMEntityReference ();+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMEvent : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMEvent ();+		public bool get_bubbles ();+		public bool get_cancel_bubble ();+		public bool get_cancelable ();+		public unowned WebKit.DOMEventTarget get_current_target ();+		public bool get_default_prevented ();+		public ushort get_event_phase ();+		public bool get_return_value ();+		public unowned WebKit.DOMEventTarget get_src_element ();+		public unowned WebKit.DOMEventTarget get_target ();+		public uint32 get_time_stamp ();+		public void init_event (string event_type_arg, bool can_bubble_arg, bool cancelable_arg);+		public void prevent_default ();+		public void set_cancel_bubble (bool value);+		public void set_return_value (bool value);+		public void stop_immediate_propagation ();+		public void stop_propagation ();+		public bool bubbles { get; }+		public bool cancel_bubble { get; set; }+		public bool cancelable { get; }+		public WebKit.DOMEventTarget current_target { get; }+		public bool default_prevented { get; }+		public uint event_phase { get; }+		public bool return_value { get; set; }+		public WebKit.DOMEventTarget src_element { get; }+		public WebKit.DOMEventTarget target { get; }+		public uint time_stamp { get; }+		[NoAccessorMethod]+		public string type { owned get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	[Compact]+	public class DOMEventTargetClass {+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMFile : WebKit.DOMBlob {+		[CCode (has_construct_function = false)]+		protected DOMFile ();+		public unowned string get_file_name ();+		public uint64 get_file_size ();+		public unowned string get_name ();+		public string file_name { get; }+		public uint64 file_size { get; }+		public string name { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMFileList : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMFileList ();+		public ulong get_length ();+		public unowned WebKit.DOMFile item (ulong index);+		public ulong length { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMGeolocation : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMGeolocation ();+		public void clear_watch (long watch_id);+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLAnchorElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLAnchorElement ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_access_key")]+		public unowned string get_access_key ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_charset")]+		public unowned string get_charset ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_coords")]+		public unowned string get_coords ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_download")]+		public unowned string get_download ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_hash")]+		public unowned string get_hash ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_host")]+		public unowned string get_host ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_hostname")]+		public unowned string get_hostname ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_href")]+		public unowned string get_href ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_hreflang")]+		public unowned string get_hreflang ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_origin")]+		public unowned string get_origin ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_parameter")]+		public unowned string get_parameter (string name);+		[CCode (cname = "webkit_dom_html_anchor_element_get_pathname")]+		public unowned string get_pathname ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_ping")]+		public unowned string get_ping ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_port")]+		public unowned string get_port ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_protocol")]+		public unowned string get_protocol ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_rel")]+		public unowned string get_rel ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_rev")]+		public unowned string get_rev ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_search")]+		public unowned string get_search ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_shape")]+		public unowned string get_shape ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_target")]+		public unowned string get_target ();+		[CCode (cname = "webkit_dom_html_anchor_element_get_text")]+		public unowned string get_text ();+		[CCode (cname = "webkit_dom_html_anchor_element_set_access_key")]+		public void set_access_key (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_charset")]+		public void set_charset (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_coords")]+		public void set_coords (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_download")]+		public void set_download (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_hash")]+		public void set_hash (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_host")]+		public void set_host (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_hostname")]+		public void set_hostname (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_href")]+		public void set_href (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_hreflang")]+		public void set_hreflang (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_name")]+		public void set_name (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_pathname")]+		public void set_pathname (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_ping")]+		public void set_ping (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_port")]+		public void set_port (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_protocol")]+		public void set_protocol (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_rel")]+		public void set_rel (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_rev")]+		public void set_rev (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_search")]+		public void set_search (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_shape")]+		public void set_shape (string value);+		[CCode (cname = "webkit_dom_html_anchor_element_set_target")]+		public void set_target (string value);+		public string access_key { get; set; }+		public string charset { get; set; }+		public string coords { get; set; }+		public string hash { get; set; }+		public string host { get; set; }+		public string hostname { get; set; }+		public string href { get; set; }+		public string hreflang { get; set; }+		public string name { get; set; }+		public string origin { get; }+		public string pathname { get; set; }+		public string ping { get; set; }+		public string port { get; set; }+		public string protocol { get; set; }+		public string rel { get; set; }+		public string rev { get; set; }+		public string search { get; set; }+		public string shape { get; set; }+		public string target { get; set; }+		public string text { get; }+		[NoAccessorMethod]+		public string type { owned get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLAppletElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLAppletElement ();+		[CCode (cname = "webkit_dom_html_applet_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_applet_element_get_alt")]+		public unowned string get_alt ();+		[CCode (cname = "webkit_dom_html_applet_element_get_archive")]+		public unowned string get_archive ();+		[CCode (cname = "webkit_dom_html_applet_element_get_code")]+		public unowned string get_code ();+		[CCode (cname = "webkit_dom_html_applet_element_get_code_base")]+		public unowned string get_code_base ();+		[CCode (cname = "webkit_dom_html_applet_element_get_height")]+		public unowned string get_height ();+		[CCode (cname = "webkit_dom_html_applet_element_get_hspace")]+		public long get_hspace ();+		[CCode (cname = "webkit_dom_html_applet_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_applet_element_get_object")]+		public unowned string get_object ();+		[CCode (cname = "webkit_dom_html_applet_element_get_vspace")]+		public long get_vspace ();+		[CCode (cname = "webkit_dom_html_applet_element_get_width")]+		public unowned string get_width ();+		[CCode (cname = "webkit_dom_html_applet_element_set_align")]+		public void set_align (string value);+		[CCode (cname = "webkit_dom_html_applet_element_set_alt")]+		public void set_alt (string value);+		[CCode (cname = "webkit_dom_html_applet_element_set_archive")]+		public void set_archive (string value);+		[CCode (cname = "webkit_dom_html_applet_element_set_code")]+		public void set_code (string value);+		[CCode (cname = "webkit_dom_html_applet_element_set_code_base")]+		public void set_code_base (string value);+		[CCode (cname = "webkit_dom_html_applet_element_set_height")]+		public void set_height (string value);+		[CCode (cname = "webkit_dom_html_applet_element_set_hspace")]+		public void set_hspace (long value);+		[CCode (cname = "webkit_dom_html_applet_element_set_name")]+		public void set_name (string value);+		[CCode (cname = "webkit_dom_html_applet_element_set_object")]+		public void set_object (string value);+		[CCode (cname = "webkit_dom_html_applet_element_set_vspace")]+		public void set_vspace (long value);+		[CCode (cname = "webkit_dom_html_applet_element_set_width")]+		public void set_width (string value);+		public string align { get; set; }+		public string alt { get; set; }+		public string archive { get; set; }+		public string code { get; set; }+		public string code_base { get; set; }+		public string height { get; set; }+		public long hspace { get; set; }+		public string name { get; set; }+		public string object { get; set; }+		public long vspace { get; set; }+		public string width { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLAreaElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLAreaElement ();+		[CCode (cname = "webkit_dom_html_area_element_get_access_key")]+		public unowned string get_access_key ();+		[CCode (cname = "webkit_dom_html_area_element_get_alt")]+		public unowned string get_alt ();+		[CCode (cname = "webkit_dom_html_area_element_get_coords")]+		public unowned string get_coords ();+		[CCode (cname = "webkit_dom_html_area_element_get_hash")]+		public unowned string get_hash ();+		[CCode (cname = "webkit_dom_html_area_element_get_host")]+		public unowned string get_host ();+		[CCode (cname = "webkit_dom_html_area_element_get_hostname")]+		public unowned string get_hostname ();+		[CCode (cname = "webkit_dom_html_area_element_get_href")]+		public unowned string get_href ();+		[CCode (cname = "webkit_dom_html_area_element_get_no_href")]+		public bool get_no_href ();+		[CCode (cname = "webkit_dom_html_area_element_get_pathname")]+		public unowned string get_pathname ();+		[CCode (cname = "webkit_dom_html_area_element_get_ping")]+		public unowned string get_ping ();+		[CCode (cname = "webkit_dom_html_area_element_get_port")]+		public unowned string get_port ();+		[CCode (cname = "webkit_dom_html_area_element_get_protocol")]+		public unowned string get_protocol ();+		[CCode (cname = "webkit_dom_html_area_element_get_search")]+		public unowned string get_search ();+		[CCode (cname = "webkit_dom_html_area_element_get_shape")]+		public unowned string get_shape ();+		[CCode (cname = "webkit_dom_html_area_element_get_target")]+		public unowned string get_target ();+		[CCode (cname = "webkit_dom_html_area_element_set_access_key")]+		public void set_access_key (string value);+		[CCode (cname = "webkit_dom_html_area_element_set_alt")]+		public void set_alt (string value);+		[CCode (cname = "webkit_dom_html_area_element_set_coords")]+		public void set_coords (string value);+		[CCode (cname = "webkit_dom_html_area_element_set_href")]+		public void set_href (string value);+		[CCode (cname = "webkit_dom_html_area_element_set_no_href")]+		public void set_no_href (bool value);+		[CCode (cname = "webkit_dom_html_area_element_set_ping")]+		public void set_ping (string value);+		[CCode (cname = "webkit_dom_html_area_element_set_shape")]+		public void set_shape (string value);+		[CCode (cname = "webkit_dom_html_area_element_set_target")]+		public void set_target (string value);+		public string access_key { get; set; }+		public string alt { get; set; }+		public string coords { get; set; }+		public string hash { get; }+		public string host { get; }+		public string hostname { get; }+		public string href { get; set; }+		public bool no_href { get; set; }+		public string pathname { get; }+		public string ping { get; set; }+		public string port { get; }+		public string protocol { get; }+		public string search { get; }+		public string shape { get; set; }+		public string target { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLAudioElement : WebKit.DOMHTMLMediaElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLAudioElement ();+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLBRElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLBRElement ();+		[CCode (cname = "webkit_dom_htmlbr_element_get_clear")]+		public unowned string get_clear ();+		[CCode (cname = "webkit_dom_htmlbr_element_set_clear")]+		public void set_clear (string value);+		public string clear { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLBaseElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLBaseElement ();+		[CCode (cname = "webkit_dom_html_base_element_get_href")]+		public unowned string get_href ();+		[CCode (cname = "webkit_dom_html_base_element_get_target")]+		public unowned string get_target ();+		[CCode (cname = "webkit_dom_html_base_element_set_href")]+		public void set_href (string value);+		[CCode (cname = "webkit_dom_html_base_element_set_target")]+		public void set_target (string value);+		public string href { get; set; }+		public string target { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLBaseFontElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLBaseFontElement ();+		[CCode (cname = "webkit_dom_html_base_font_element_get_color")]+		public unowned string get_color ();+		[CCode (cname = "webkit_dom_html_base_font_element_get_face")]+		public unowned string get_face ();+		[CCode (cname = "webkit_dom_html_base_font_element_get_size")]+		public long get_size ();+		[CCode (cname = "webkit_dom_html_base_font_element_set_color")]+		public void set_color (string value);+		[CCode (cname = "webkit_dom_html_base_font_element_set_face")]+		public void set_face (string value);+		[CCode (cname = "webkit_dom_html_base_font_element_set_size")]+		public void set_size (long value);+		public string color { get; set; }+		public string face { get; set; }+		public long size { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLBodyElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLBodyElement ();+		[CCode (cname = "webkit_dom_html_body_element_get_a_link")]+		public unowned string get_a_link ();+		[CCode (cname = "webkit_dom_html_body_element_get_background")]+		public unowned string get_background ();+		[CCode (cname = "webkit_dom_html_body_element_get_bg_color")]+		public unowned string get_bg_color ();+		[CCode (cname = "webkit_dom_html_body_element_get_link")]+		public unowned string get_link ();+		[CCode (cname = "webkit_dom_html_body_element_get_text")]+		public unowned string get_text ();+		[CCode (cname = "webkit_dom_html_body_element_get_v_link")]+		public unowned string get_v_link ();+		[CCode (cname = "webkit_dom_html_body_element_set_a_link")]+		public void set_a_link (string value);+		[CCode (cname = "webkit_dom_html_body_element_set_background")]+		public void set_background (string value);+		[CCode (cname = "webkit_dom_html_body_element_set_bg_color")]+		public void set_bg_color (string value);+		[CCode (cname = "webkit_dom_html_body_element_set_link")]+		public void set_link (string value);+		[CCode (cname = "webkit_dom_html_body_element_set_text")]+		public void set_text (string value);+		[CCode (cname = "webkit_dom_html_body_element_set_v_link")]+		public void set_v_link (string value);+		public string a_link { get; set; }+		public string background { get; set; }+		public string bg_color { get; set; }+		public string link { get; set; }+		public string text { get; set; }+		public string v_link { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLButtonElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLButtonElement ();+		[CCode (cname = "webkit_dom_html_button_element_check_validity")]+		public bool check_validity ();+		[CCode (cname = "webkit_dom_html_button_element_click")]+		public void click ();+		[CCode (cname = "webkit_dom_html_button_element_get_access_key")]+		public unowned string get_access_key ();+		[CCode (cname = "webkit_dom_html_button_element_get_autofocus")]+		public bool get_autofocus ();+		[CCode (cname = "webkit_dom_html_button_element_get_disabled")]+		public bool get_disabled ();+		[CCode (cname = "webkit_dom_html_button_element_get_form")]+		public unowned WebKit.DOMHTMLFormElement get_form ();+		[CCode (cname = "webkit_dom_html_button_element_get_form_action")]+		public unowned string get_form_action ();+		[CCode (cname = "webkit_dom_html_button_element_get_form_enctype")]+		public unowned string get_form_enctype ();+		[CCode (cname = "webkit_dom_html_button_element_get_form_method")]+		public unowned string get_form_method ();+		[CCode (cname = "webkit_dom_html_button_element_get_form_no_validate")]+		public bool get_form_no_validate ();+		[CCode (cname = "webkit_dom_html_button_element_get_form_target")]+		public unowned string get_form_target ();+		[CCode (cname = "webkit_dom_html_button_element_get_labels")]+		public unowned WebKit.DOMNodeList get_labels ();+		[CCode (cname = "webkit_dom_html_button_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_button_element_get_validation_message")]+		public unowned string get_validation_message ();+		[CCode (cname = "webkit_dom_html_button_element_get_validity")]+		public unowned WebKit.DOMValidityState get_validity ();+		[CCode (cname = "webkit_dom_html_button_element_get_value")]+		public unowned string get_value ();+		[CCode (cname = "webkit_dom_html_button_element_get_will_validate")]+		public bool get_will_validate ();+		[CCode (cname = "webkit_dom_html_button_element_set_access_key")]+		public void set_access_key (string value);+		[CCode (cname = "webkit_dom_html_button_element_set_autofocus")]+		public void set_autofocus (bool value);+		[CCode (cname = "webkit_dom_html_button_element_set_custom_validity")]+		public void set_custom_validity (string error);+		[CCode (cname = "webkit_dom_html_button_element_set_disabled")]+		public void set_disabled (bool value);+		[CCode (cname = "webkit_dom_html_button_element_set_form_action")]+		public void set_form_action (string value);+		[CCode (cname = "webkit_dom_html_button_element_set_form_enctype")]+		public void set_form_enctype (string value);+		[CCode (cname = "webkit_dom_html_button_element_set_form_method")]+		public void set_form_method (string value);+		[CCode (cname = "webkit_dom_html_button_element_set_form_no_validate")]+		public void set_form_no_validate (bool value);+		[CCode (cname = "webkit_dom_html_button_element_set_form_target")]+		public void set_form_target (string value);+		[CCode (cname = "webkit_dom_html_button_element_set_name")]+		public void set_name (string value);+		[CCode (cname = "webkit_dom_html_button_element_set_value")]+		public void set_value (string value);+		public string access_key { get; set; }+		public bool autofocus { get; set; }+		public bool disabled { get; set; }+		public WebKit.DOMHTMLFormElement form { get; }+		public string form_action { get; set; }+		public string form_enctype { get; set; }+		public string form_method { get; set; }+		public bool form_no_validate { get; set; }+		public string form_target { get; set; }+		public WebKit.DOMNodeList labels { get; }+		public string name { get; set; }+		[NoAccessorMethod]+		public string type { owned get; }+		public string validation_message { get; }+		public WebKit.DOMValidityState validity { get; }+		public string value { get; set; }+		public bool will_validate { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLCanvasElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLCanvasElement ();+		[CCode (cname = "webkit_dom_html_canvas_element_get_height")]+		public long get_height ();+		[CCode (cname = "webkit_dom_html_canvas_element_get_width")]+		public long get_width ();+		[CCode (cname = "webkit_dom_html_canvas_element_set_height")]+		public void set_height (long value);+		[CCode (cname = "webkit_dom_html_canvas_element_set_width")]+		public void set_width (long value);+		public long height { get; set; }+		public long width { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLCollection : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMHTMLCollection ();+		[CCode (cname = "webkit_dom_html_collection_get_length")]+		public ulong get_length ();+		[CCode (cname = "webkit_dom_html_collection_item")]+		public unowned WebKit.DOMNode item (ulong index);+		[CCode (cname = "webkit_dom_html_collection_named_item")]+		public unowned WebKit.DOMNode named_item (string name);+		public ulong length { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLDListElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLDListElement ();+		[CCode (cname = "webkit_dom_htmld_list_element_get_compact")]+		public bool get_compact ();+		[CCode (cname = "webkit_dom_htmld_list_element_set_compact")]+		public void set_compact (bool value);+		public bool compact { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLDetailsElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLDetailsElement ();+		[CCode (cname = "webkit_dom_html_details_element_get_open")]+		public bool get_open ();+		[CCode (cname = "webkit_dom_html_details_element_set_open")]+		public void set_open (bool value);+		public bool open { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLDirectoryElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLDirectoryElement ();+		[CCode (cname = "webkit_dom_html_directory_element_get_compact")]+		public bool get_compact ();+		[CCode (cname = "webkit_dom_html_directory_element_set_compact")]+		public void set_compact (bool value);+		public bool compact { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLDivElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLDivElement ();+		[CCode (cname = "webkit_dom_html_div_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_div_element_set_align")]+		public void set_align (string value);+		public string align { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLDocument : WebKit.DOMDocument, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLDocument ();+		[CCode (cname = "webkit_dom_html_document_capture_events")]+		public void capture_events ();+		[CCode (cname = "webkit_dom_html_document_clear")]+		public void clear ();+		[CCode (cname = "webkit_dom_html_document_close")]+		public void close ();+		[CCode (cname = "webkit_dom_html_document_get_active_element")]+		public unowned WebKit.DOMElement get_active_element ();+		[CCode (cname = "webkit_dom_html_document_get_alink_color")]+		public unowned string get_alink_color ();+		[CCode (cname = "webkit_dom_html_document_get_bg_color")]+		public unowned string get_bg_color ();+		[CCode (cname = "webkit_dom_html_document_get_compat_mode")]+		public unowned string get_compat_mode ();+		[CCode (cname = "webkit_dom_html_document_get_design_mode")]+		public unowned string get_design_mode ();+		[CCode (cname = "webkit_dom_html_document_get_dir")]+		public unowned string get_dir ();+		[CCode (cname = "webkit_dom_html_document_get_embeds")]+		public unowned WebKit.DOMHTMLCollection get_embeds ();+		[CCode (cname = "webkit_dom_html_document_get_fg_color")]+		public unowned string get_fg_color ();+		[CCode (cname = "webkit_dom_html_document_get_height")]+		public long get_height ();+		[CCode (cname = "webkit_dom_html_document_get_link_color")]+		public unowned string get_link_color ();+		[CCode (cname = "webkit_dom_html_document_get_plugins")]+		public unowned WebKit.DOMHTMLCollection get_plugins ();+		[CCode (cname = "webkit_dom_html_document_get_scripts")]+		public unowned WebKit.DOMHTMLCollection get_scripts ();+		[CCode (cname = "webkit_dom_html_document_get_vlink_color")]+		public unowned string get_vlink_color ();+		[CCode (cname = "webkit_dom_html_document_get_width")]+		public long get_width ();+		[CCode (cname = "webkit_dom_html_document_has_focus")]+		public bool has_focus ();+		[CCode (cname = "webkit_dom_html_document_release_events")]+		public void release_events ();+		[CCode (cname = "webkit_dom_html_document_set_alink_color")]+		public void set_alink_color (string value);+		[CCode (cname = "webkit_dom_html_document_set_bg_color")]+		public void set_bg_color (string value);+		[CCode (cname = "webkit_dom_html_document_set_design_mode")]+		public void set_design_mode (string value);+		[CCode (cname = "webkit_dom_html_document_set_dir")]+		public void set_dir (string value);+		[CCode (cname = "webkit_dom_html_document_set_fg_color")]+		public void set_fg_color (string value);+		[CCode (cname = "webkit_dom_html_document_set_link_color")]+		public void set_link_color (string value);+		[CCode (cname = "webkit_dom_html_document_set_vlink_color")]+		public void set_vlink_color (string value);+		public WebKit.DOMElement active_element { get; }+		public string alink_color { get; set; }+		public string bg_color { get; set; }+		public string compat_mode { get; }+		public string design_mode { get; set; }+		public string dir { get; set; }+		public WebKit.DOMHTMLCollection embeds { get; }+		public string fg_color { get; set; }+		public long height { get; }+		public string link_color { get; set; }+		public WebKit.DOMHTMLCollection plugins { get; }+		public WebKit.DOMHTMLCollection scripts { get; }+		public string vlink_color { get; set; }+		public long width { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLElement : WebKit.DOMElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLElement ();+		[CCode (cname = "webkit_dom_html_element_get_children")]+		public unowned WebKit.DOMHTMLCollection get_children ();+		[CCode (cname = "webkit_dom_html_element_get_class_list")]+		public unowned WebKit.DOMDOMTokenList get_class_list ();+		[CCode (cname = "webkit_dom_html_element_get_class_name")]+		public unowned string get_class_name ();+		[CCode (cname = "webkit_dom_html_element_get_content_editable")]+		public unowned string get_content_editable ();+		[CCode (cname = "webkit_dom_html_element_get_dir")]+		public unowned string get_dir ();+		[CCode (cname = "webkit_dom_html_element_get_draggable")]+		public bool get_draggable ();+		[CCode (cname = "webkit_dom_html_element_get_hidden")]+		public bool get_hidden ();+		[CCode (cname = "webkit_dom_html_element_get_id")]+		public unowned string get_id ();+		[CCode (cname = "webkit_dom_html_element_get_inner_html")]+		public unowned string get_inner_html ();+		[CCode (cname = "webkit_dom_html_element_get_inner_text")]+		public unowned string get_inner_text ();+		[CCode (cname = "webkit_dom_html_element_get_is_content_editable")]+		public bool get_is_content_editable ();+		[CCode (cname = "webkit_dom_html_element_get_lang")]+		public unowned string get_lang ();+		[CCode (cname = "webkit_dom_html_element_get_outer_html")]+		public unowned string get_outer_html ();+		[CCode (cname = "webkit_dom_html_element_get_outer_text")]+		public unowned string get_outer_text ();+		[CCode (cname = "webkit_dom_html_element_get_spellcheck")]+		public bool get_spellcheck ();+		[CCode (cname = "webkit_dom_html_element_get_tab_index")]+		public long get_tab_index ();+		[CCode (cname = "webkit_dom_html_element_get_title")]+		public unowned string get_title ();+		[CCode (cname = "webkit_dom_html_element_get_webkitdropzone")]+		public unowned string get_webkitdropzone ();+		[CCode (cname = "webkit_dom_html_element_insert_adjacent_element")]+		public unowned WebKit.DOMElement insert_adjacent_element (string where, WebKit.DOMElement element) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_element_insert_adjacent_html")]+		public void insert_adjacent_html (string where, string html) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_element_insert_adjacent_text")]+		public void insert_adjacent_text (string where, string text) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_element_set_class_name")]+		public void set_class_name (string value);+		[CCode (cname = "webkit_dom_html_element_set_content_editable")]+		public void set_content_editable (string value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_element_set_dir")]+		public void set_dir (string value);+		[CCode (cname = "webkit_dom_html_element_set_draggable")]+		public void set_draggable (bool value);+		[CCode (cname = "webkit_dom_html_element_set_hidden")]+		public void set_hidden (bool value);+		[CCode (cname = "webkit_dom_html_element_set_id")]+		public void set_id (string value);+		[CCode (cname = "webkit_dom_html_element_set_inner_html")]+		public void set_inner_html (string value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_element_set_inner_text")]+		public void set_inner_text (string value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_element_set_lang")]+		public void set_lang (string value);+		[CCode (cname = "webkit_dom_html_element_set_outer_html")]+		public void set_outer_html (string value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_element_set_outer_text")]+		public void set_outer_text (string value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_element_set_spellcheck")]+		public void set_spellcheck (bool value);+		[CCode (cname = "webkit_dom_html_element_set_tab_index")]+		public void set_tab_index (long value);+		[CCode (cname = "webkit_dom_html_element_set_title")]+		public void set_title (string value);+		[CCode (cname = "webkit_dom_html_element_set_webkitdropzone")]+		public void set_webkitdropzone (string value);+		public WebKit.DOMHTMLCollection children { get; }+		public WebKit.DOMDOMTokenList class_list { get; }+		public string class_name { get; set; }+		public string content_editable { get; set; }+		public string dir { get; set; }+		public bool draggable { get; set; }+		public bool hidden { get; set; }+		public string id { get; set; }+		public string inner_html { get; set; }+		public string inner_text { get; set; }+		public bool is_content_editable { get; }+		public string lang { get; set; }+		public string outer_html { get; set; }+		public string outer_text { get; set; }+		public bool spellcheck { get; set; }+		public long tab_index { get; set; }+		public string title { get; set; }+		public string webkitdropzone { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLEmbedElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLEmbedElement ();+		[CCode (cname = "webkit_dom_html_embed_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_embed_element_get_height")]+		public long get_height ();+		[CCode (cname = "webkit_dom_html_embed_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_embed_element_get_src")]+		public unowned string get_src ();+		[CCode (cname = "webkit_dom_html_embed_element_get_width")]+		public long get_width ();+		[CCode (cname = "webkit_dom_html_embed_element_set_align")]+		public void set_align (string value);+		[CCode (cname = "webkit_dom_html_embed_element_set_height")]+		public void set_height (long value);+		[CCode (cname = "webkit_dom_html_embed_element_set_name")]+		public void set_name (string value);+		[CCode (cname = "webkit_dom_html_embed_element_set_src")]+		public void set_src (string value);+		[CCode (cname = "webkit_dom_html_embed_element_set_width")]+		public void set_width (long value);+		public string align { get; set; }+		public long height { get; set; }+		public string name { get; set; }+		public string src { get; set; }+		[NoAccessorMethod]+		public string type { owned get; set; }+		public long width { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLFieldSetElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLFieldSetElement ();+		[CCode (cname = "webkit_dom_html_field_set_element_check_validity")]+		public bool check_validity ();+		[CCode (cname = "webkit_dom_html_field_set_element_get_form")]+		public unowned WebKit.DOMHTMLFormElement get_form ();+		[CCode (cname = "webkit_dom_html_field_set_element_get_validation_message")]+		public unowned string get_validation_message ();+		[CCode (cname = "webkit_dom_html_field_set_element_get_validity")]+		public unowned WebKit.DOMValidityState get_validity ();+		[CCode (cname = "webkit_dom_html_field_set_element_get_will_validate")]+		public bool get_will_validate ();+		[CCode (cname = "webkit_dom_html_field_set_element_set_custom_validity")]+		public void set_custom_validity (string error);+		public WebKit.DOMHTMLFormElement form { get; }+		public string validation_message { get; }+		public WebKit.DOMValidityState validity { get; }+		public bool will_validate { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLFontElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLFontElement ();+		[CCode (cname = "webkit_dom_html_font_element_get_color")]+		public unowned string get_color ();+		[CCode (cname = "webkit_dom_html_font_element_get_face")]+		public unowned string get_face ();+		[CCode (cname = "webkit_dom_html_font_element_get_size")]+		public unowned string get_size ();+		[CCode (cname = "webkit_dom_html_font_element_set_color")]+		public void set_color (string value);+		[CCode (cname = "webkit_dom_html_font_element_set_face")]+		public void set_face (string value);+		[CCode (cname = "webkit_dom_html_font_element_set_size")]+		public void set_size (string value);+		public string color { get; set; }+		public string face { get; set; }+		public string size { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLFormElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLFormElement ();+		[CCode (cname = "webkit_dom_html_form_element_check_validity")]+		public bool check_validity ();+		[CCode (cname = "webkit_dom_html_form_element_dispatch_form_change")]+		public void dispatch_form_change ();+		[CCode (cname = "webkit_dom_html_form_element_dispatch_form_input")]+		public void dispatch_form_input ();+		[CCode (cname = "webkit_dom_html_form_element_get_accept_charset")]+		public unowned string get_accept_charset ();+		[CCode (cname = "webkit_dom_html_form_element_get_action")]+		public unowned string get_action ();+		[CCode (cname = "webkit_dom_html_form_element_get_autocomplete")]+		public unowned string get_autocomplete ();+		[CCode (cname = "webkit_dom_html_form_element_get_elements")]+		public unowned WebKit.DOMHTMLCollection get_elements ();+		[CCode (cname = "webkit_dom_html_form_element_get_encoding")]+		public unowned string get_encoding ();+		[CCode (cname = "webkit_dom_html_form_element_get_enctype")]+		public unowned string get_enctype ();+		[CCode (cname = "webkit_dom_html_form_element_get_length")]+		public long get_length ();+		[CCode (cname = "webkit_dom_html_form_element_get_method")]+		public unowned string get_method ();+		[CCode (cname = "webkit_dom_html_form_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_form_element_get_no_validate")]+		public bool get_no_validate ();+		[CCode (cname = "webkit_dom_html_form_element_get_target")]+		public unowned string get_target ();+		[CCode (cname = "webkit_dom_html_form_element_reset")]+		public void reset ();+		[CCode (cname = "webkit_dom_html_form_element_set_accept_charset")]+		public void set_accept_charset (string value);+		[CCode (cname = "webkit_dom_html_form_element_set_action")]+		public void set_action (string value);+		[CCode (cname = "webkit_dom_html_form_element_set_autocomplete")]+		public void set_autocomplete (string value);+		[CCode (cname = "webkit_dom_html_form_element_set_encoding")]+		public void set_encoding (string value);+		[CCode (cname = "webkit_dom_html_form_element_set_enctype")]+		public void set_enctype (string value);+		[CCode (cname = "webkit_dom_html_form_element_set_method")]+		public void set_method (string value);+		[CCode (cname = "webkit_dom_html_form_element_set_name")]+		public void set_name (string value);+		[CCode (cname = "webkit_dom_html_form_element_set_no_validate")]+		public void set_no_validate (bool value);+		[CCode (cname = "webkit_dom_html_form_element_set_target")]+		public void set_target (string value);+		[CCode (cname = "webkit_dom_html_form_element_submit")]+		public void submit ();+		public string accept_charset { get; set; }+		public string action { get; set; }+		public string autocomplete { get; set; }+		public WebKit.DOMHTMLCollection elements { get; }+		public string encoding { get; set; }+		public string enctype { get; set; }+		public long length { get; }+		public string method { get; set; }+		public string name { get; set; }+		public bool no_validate { get; set; }+		public string target { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLFrameElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLFrameElement ();+		[CCode (cname = "webkit_dom_html_frame_element_get_content_document")]+		public unowned WebKit.DOMDocument get_content_document ();+		[CCode (cname = "webkit_dom_html_frame_element_get_content_window")]+		public unowned WebKit.DOMDOMWindow get_content_window ();+		[CCode (cname = "webkit_dom_html_frame_element_get_frame_border")]+		public unowned string get_frame_border ();+		[CCode (cname = "webkit_dom_html_frame_element_get_height")]+		public long get_height ();+		[CCode (cname = "webkit_dom_html_frame_element_get_long_desc")]+		public unowned string get_long_desc ();+		[CCode (cname = "webkit_dom_html_frame_element_get_margin_height")]+		public unowned string get_margin_height ();+		[CCode (cname = "webkit_dom_html_frame_element_get_margin_width")]+		public unowned string get_margin_width ();+		[CCode (cname = "webkit_dom_html_frame_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_frame_element_get_no_resize")]+		public bool get_no_resize ();+		[CCode (cname = "webkit_dom_html_frame_element_get_scrolling")]+		public unowned string get_scrolling ();+		[CCode (cname = "webkit_dom_html_frame_element_get_src")]+		public unowned string get_src ();+		[CCode (cname = "webkit_dom_html_frame_element_get_width")]+		public long get_width ();+		[CCode (cname = "webkit_dom_html_frame_element_set_frame_border")]+		public void set_frame_border (string value);+		[CCode (cname = "webkit_dom_html_frame_element_set_long_desc")]+		public void set_long_desc (string value);+		[CCode (cname = "webkit_dom_html_frame_element_set_margin_height")]+		public void set_margin_height (string value);+		[CCode (cname = "webkit_dom_html_frame_element_set_margin_width")]+		public void set_margin_width (string value);+		[CCode (cname = "webkit_dom_html_frame_element_set_name")]+		public void set_name (string value);+		[CCode (cname = "webkit_dom_html_frame_element_set_no_resize")]+		public void set_no_resize (bool value);+		[CCode (cname = "webkit_dom_html_frame_element_set_scrolling")]+		public void set_scrolling (string value);+		[CCode (cname = "webkit_dom_html_frame_element_set_src")]+		public void set_src (string value);+		public WebKit.DOMDocument content_document { get; }+		public WebKit.DOMDOMWindow content_window { get; }+		public string frame_border { get; set; }+		public long height { get; }+		public string long_desc { get; set; }+		public string margin_height { get; set; }+		public string margin_width { get; set; }+		public string name { get; set; }+		public bool no_resize { get; set; }+		public string scrolling { get; set; }+		public string src { get; set; }+		public long width { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLFrameSetElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLFrameSetElement ();+		[CCode (cname = "webkit_dom_html_frame_set_element_get_cols")]+		public unowned string get_cols ();+		[CCode (cname = "webkit_dom_html_frame_set_element_get_rows")]+		public unowned string get_rows ();+		[CCode (cname = "webkit_dom_html_frame_set_element_set_cols")]+		public void set_cols (string value);+		[CCode (cname = "webkit_dom_html_frame_set_element_set_rows")]+		public void set_rows (string value);+		public string cols { get; set; }+		public string rows { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLHRElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLHRElement ();+		[CCode (cname = "webkit_dom_htmlhr_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_htmlhr_element_get_no_shade")]+		public bool get_no_shade ();+		[CCode (cname = "webkit_dom_htmlhr_element_get_size")]+		public unowned string get_size ();+		[CCode (cname = "webkit_dom_htmlhr_element_get_width")]+		public unowned string get_width ();+		[CCode (cname = "webkit_dom_htmlhr_element_set_align")]+		public void set_align (string value);+		[CCode (cname = "webkit_dom_htmlhr_element_set_no_shade")]+		public void set_no_shade (bool value);+		[CCode (cname = "webkit_dom_htmlhr_element_set_size")]+		public void set_size (string value);+		[CCode (cname = "webkit_dom_htmlhr_element_set_width")]+		public void set_width (string value);+		public string align { get; set; }+		public bool no_shade { get; set; }+		public string size { get; set; }+		public string width { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLHeadElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLHeadElement ();+		[CCode (cname = "webkit_dom_html_head_element_get_profile")]+		public unowned string get_profile ();+		[CCode (cname = "webkit_dom_html_head_element_set_profile")]+		public void set_profile (string value);+		public string profile { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLHeadingElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLHeadingElement ();+		[CCode (cname = "webkit_dom_html_heading_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_heading_element_set_align")]+		public void set_align (string value);+		public string align { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLHtmlElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLHtmlElement ();+		[CCode (cname = "webkit_dom_html_html_element_get_manifest")]+		public unowned string get_manifest ();+		[CCode (cname = "webkit_dom_html_html_element_get_version")]+		public unowned string get_version ();+		[CCode (cname = "webkit_dom_html_html_element_set_manifest")]+		public void set_manifest (string value);+		[CCode (cname = "webkit_dom_html_html_element_set_version")]+		public void set_version (string value);+		public string manifest { get; set; }+		public string version { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLIFrameElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLIFrameElement ();+		[CCode (cname = "webkit_dom_html_iframe_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_iframe_element_get_content_document")]+		public unowned WebKit.DOMDocument get_content_document ();+		[CCode (cname = "webkit_dom_html_iframe_element_get_content_window")]+		public unowned WebKit.DOMDOMWindow get_content_window ();+		[CCode (cname = "webkit_dom_html_iframe_element_get_frame_border")]+		public unowned string get_frame_border ();+		[CCode (cname = "webkit_dom_html_iframe_element_get_height")]+		public unowned string get_height ();+		[CCode (cname = "webkit_dom_html_iframe_element_get_long_desc")]+		public unowned string get_long_desc ();+		[CCode (cname = "webkit_dom_html_iframe_element_get_margin_height")]+		public unowned string get_margin_height ();+		[CCode (cname = "webkit_dom_html_iframe_element_get_margin_width")]+		public unowned string get_margin_width ();+		[CCode (cname = "webkit_dom_html_iframe_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_iframe_element_get_sandbox")]+		public unowned string get_sandbox ();+		[CCode (cname = "webkit_dom_html_iframe_element_get_scrolling")]+		public unowned string get_scrolling ();+		[CCode (cname = "webkit_dom_html_iframe_element_get_src")]+		public unowned string get_src ();+		[CCode (cname = "webkit_dom_html_iframe_element_get_width")]+		public unowned string get_width ();+		[CCode (cname = "webkit_dom_html_iframe_element_set_align")]+		public void set_align (string value);+		[CCode (cname = "webkit_dom_html_iframe_element_set_frame_border")]+		public void set_frame_border (string value);+		[CCode (cname = "webkit_dom_html_iframe_element_set_height")]+		public void set_height (string value);+		[CCode (cname = "webkit_dom_html_iframe_element_set_long_desc")]+		public void set_long_desc (string value);+		[CCode (cname = "webkit_dom_html_iframe_element_set_margin_height")]+		public void set_margin_height (string value);+		[CCode (cname = "webkit_dom_html_iframe_element_set_margin_width")]+		public void set_margin_width (string value);+		[CCode (cname = "webkit_dom_html_iframe_element_set_name")]+		public void set_name (string value);+		[CCode (cname = "webkit_dom_html_iframe_element_set_sandbox")]+		public void set_sandbox (string value);+		[CCode (cname = "webkit_dom_html_iframe_element_set_scrolling")]+		public void set_scrolling (string value);+		[CCode (cname = "webkit_dom_html_iframe_element_set_src")]+		public void set_src (string value);+		[CCode (cname = "webkit_dom_html_iframe_element_set_width")]+		public void set_width (string value);+		public string align { get; set; }+		public WebKit.DOMDocument content_document { get; }+		public WebKit.DOMDOMWindow content_window { get; }+		public string frame_border { get; set; }+		public string height { get; set; }+		public string long_desc { get; set; }+		public string margin_height { get; set; }+		public string margin_width { get; set; }+		public string name { get; set; }+		public string sandbox { get; set; }+		public string scrolling { get; set; }+		public string src { get; set; }+		public string width { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLImageElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLImageElement ();+		[CCode (cname = "webkit_dom_html_image_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_image_element_get_alt")]+		public unowned string get_alt ();+		[CCode (cname = "webkit_dom_html_image_element_get_border")]+		public unowned string get_border ();+		[CCode (cname = "webkit_dom_html_image_element_get_complete")]+		public bool get_complete ();+		[CCode (cname = "webkit_dom_html_image_element_get_cross_origin")]+		public unowned string get_cross_origin ();+		[CCode (cname = "webkit_dom_html_image_element_get_height")]+		public long get_height ();+		[CCode (cname = "webkit_dom_html_image_element_get_hspace")]+		public long get_hspace ();+		[CCode (cname = "webkit_dom_html_image_element_get_is_map")]+		public bool get_is_map ();+		[CCode (cname = "webkit_dom_html_image_element_get_long_desc")]+		public unowned string get_long_desc ();+		[CCode (cname = "webkit_dom_html_image_element_get_lowsrc")]+		public unowned string get_lowsrc ();+		[CCode (cname = "webkit_dom_html_image_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_image_element_get_natural_height")]+		public long get_natural_height ();+		[CCode (cname = "webkit_dom_html_image_element_get_natural_width")]+		public long get_natural_width ();+		[CCode (cname = "webkit_dom_html_image_element_get_src")]+		public unowned string get_src ();+		[CCode (cname = "webkit_dom_html_image_element_get_use_map")]+		public unowned string get_use_map ();+		[CCode (cname = "webkit_dom_html_image_element_get_vspace")]+		public long get_vspace ();+		[CCode (cname = "webkit_dom_html_image_element_get_width")]+		public long get_width ();+		[CCode (cname = "webkit_dom_html_image_element_get_x")]+		public long get_x ();+		[CCode (cname = "webkit_dom_html_image_element_get_y")]+		public long get_y ();+		[CCode (cname = "webkit_dom_html_image_element_set_align")]+		public void set_align (string value);+		[CCode (cname = "webkit_dom_html_image_element_set_alt")]+		public void set_alt (string value);+		[CCode (cname = "webkit_dom_html_image_element_set_border")]+		public void set_border (string value);+		[CCode (cname = "webkit_dom_html_image_element_set_cross_origin")]+		public void set_cross_origin (string value);+		[CCode (cname = "webkit_dom_html_image_element_set_height")]+		public void set_height (long value);+		[CCode (cname = "webkit_dom_html_image_element_set_hspace")]+		public void set_hspace (long value);+		[CCode (cname = "webkit_dom_html_image_element_set_is_map")]+		public void set_is_map (bool value);+		[CCode (cname = "webkit_dom_html_image_element_set_long_desc")]+		public void set_long_desc (string value);+		[CCode (cname = "webkit_dom_html_image_element_set_lowsrc")]+		public void set_lowsrc (string value);+		[CCode (cname = "webkit_dom_html_image_element_set_name")]+		public void set_name (string value);+		[CCode (cname = "webkit_dom_html_image_element_set_src")]+		public void set_src (string value);+		[CCode (cname = "webkit_dom_html_image_element_set_use_map")]+		public void set_use_map (string value);+		[CCode (cname = "webkit_dom_html_image_element_set_vspace")]+		public void set_vspace (long value);+		[CCode (cname = "webkit_dom_html_image_element_set_width")]+		public void set_width (long value);+		public string align { get; set; }+		public string alt { get; set; }+		public string border { get; set; }+		public bool complete { get; }+		public string cross_origin { get; set; }+		public long height { get; set; }+		public long hspace { get; set; }+		public bool is_map { get; set; }+		public string long_desc { get; set; }+		public string lowsrc { get; set; }+		public string name { get; set; }+		public long natural_height { get; }+		public long natural_width { get; }+		public string src { get; set; }+		public string use_map { get; set; }+		public long vspace { get; set; }+		public long width { get; set; }+		public long x { get; }+		public long y { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLInputElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLInputElement ();+		[CCode (cname = "webkit_dom_html_input_element_check_validity")]+		public bool check_validity ();+		[CCode (cname = "webkit_dom_html_input_element_click")]+		public void click ();+		[CCode (cname = "webkit_dom_html_input_element_get_accept")]+		public unowned string get_accept ();+		[CCode (cname = "webkit_dom_html_input_element_get_access_key")]+		public unowned string get_access_key ();+		[CCode (cname = "webkit_dom_html_input_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_input_element_get_alt")]+		public unowned string get_alt ();+		[CCode (cname = "webkit_dom_html_input_element_get_autocomplete")]+		public unowned string get_autocomplete ();+		[CCode (cname = "webkit_dom_html_input_element_get_autofocus")]+		public bool get_autofocus ();+		[CCode (cname = "webkit_dom_html_input_element_get_checked")]+		public bool get_checked ();+		[CCode (cname = "webkit_dom_html_input_element_get_default_checked")]+		public bool get_default_checked ();+		[CCode (cname = "webkit_dom_html_input_element_get_default_value")]+		public unowned string get_default_value ();+		[CCode (cname = "webkit_dom_html_input_element_get_disabled")]+		public bool get_disabled ();+		[CCode (cname = "webkit_dom_html_input_element_get_files")]+		public unowned WebKit.DOMFileList get_files ();+		[CCode (cname = "webkit_dom_html_input_element_get_form")]+		public unowned WebKit.DOMHTMLFormElement get_form ();+		[CCode (cname = "webkit_dom_html_input_element_get_form_action")]+		public unowned string get_form_action ();+		[CCode (cname = "webkit_dom_html_input_element_get_form_enctype")]+		public unowned string get_form_enctype ();+		[CCode (cname = "webkit_dom_html_input_element_get_form_method")]+		public unowned string get_form_method ();+		[CCode (cname = "webkit_dom_html_input_element_get_form_no_validate")]+		public bool get_form_no_validate ();+		[CCode (cname = "webkit_dom_html_input_element_get_form_target")]+		public unowned string get_form_target ();+		[CCode (cname = "webkit_dom_html_input_element_get_incremental")]+		public bool get_incremental ();+		[CCode (cname = "webkit_dom_html_input_element_get_indeterminate")]+		public bool get_indeterminate ();+		[CCode (cname = "webkit_dom_html_input_element_get_labels")]+		public unowned WebKit.DOMNodeList get_labels ();+		[CCode (cname = "webkit_dom_html_input_element_get_list")]+		public unowned WebKit.DOMHTMLElement get_list ();+		[CCode (cname = "webkit_dom_html_input_element_get_max")]+		public unowned string get_max ();+		[CCode (cname = "webkit_dom_html_input_element_get_max_length")]+		public long get_max_length ();+		[CCode (cname = "webkit_dom_html_input_element_get_min")]+		public unowned string get_min ();+		[CCode (cname = "webkit_dom_html_input_element_get_multiple")]+		public bool get_multiple ();+		[CCode (cname = "webkit_dom_html_input_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_input_element_get_pattern")]+		public unowned string get_pattern ();+		[CCode (cname = "webkit_dom_html_input_element_get_placeholder")]+		public unowned string get_placeholder ();+		[CCode (cname = "webkit_dom_html_input_element_get_read_only")]+		public bool get_read_only ();+		[CCode (cname = "webkit_dom_html_input_element_get_required")]+		public bool get_required ();+		[CCode (cname = "webkit_dom_html_input_element_get_selected_option")]+		public unowned WebKit.DOMHTMLOptionElement get_selected_option ();+		[CCode (cname = "webkit_dom_html_input_element_get_size")]+		public ulong get_size ();+		[CCode (cname = "webkit_dom_html_input_element_get_src")]+		public unowned string get_src ();+		[CCode (cname = "webkit_dom_html_input_element_get_step")]+		public unowned string get_step ();+		[CCode (cname = "webkit_dom_html_input_element_get_use_map")]+		public unowned string get_use_map ();+		[CCode (cname = "webkit_dom_html_input_element_get_validation_message")]+		public unowned string get_validation_message ();+		[CCode (cname = "webkit_dom_html_input_element_get_validity")]+		public unowned WebKit.DOMValidityState get_validity ();+		[CCode (cname = "webkit_dom_html_input_element_get_value")]+		public unowned string get_value ();+		[CCode (cname = "webkit_dom_html_input_element_get_value_as_number")]+		public double get_value_as_number ();+		[CCode (cname = "webkit_dom_html_input_element_get_webkit_grammar")]+		public bool get_webkit_grammar ();+		[CCode (cname = "webkit_dom_html_input_element_get_webkit_speech")]+		public bool get_webkit_speech ();+		[CCode (cname = "webkit_dom_html_input_element_get_webkitdirectory")]+		public bool get_webkitdirectory ();+		[CCode (cname = "webkit_dom_html_input_element_get_will_validate")]+		public bool get_will_validate ();+		[CCode (cname = "webkit_dom_html_input_element_is_edited")]+		public bool is_edited ();+		[CCode (cname = "webkit_dom_html_input_element_select")]+		public void select ();+		[CCode (cname = "webkit_dom_html_input_element_set_accept")]+		public void set_accept (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_access_key")]+		public void set_access_key (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_align")]+		public void set_align (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_alt")]+		public void set_alt (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_autocomplete")]+		public void set_autocomplete (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_autofocus")]+		public void set_autofocus (bool value);+		[CCode (cname = "webkit_dom_html_input_element_set_checked")]+		public void set_checked (bool value);+		[CCode (cname = "webkit_dom_html_input_element_set_custom_validity")]+		public void set_custom_validity (string error);+		[CCode (cname = "webkit_dom_html_input_element_set_default_checked")]+		public void set_default_checked (bool value);+		[CCode (cname = "webkit_dom_html_input_element_set_default_value")]+		public void set_default_value (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_disabled")]+		public void set_disabled (bool value);+		[CCode (cname = "webkit_dom_html_input_element_set_form_action")]+		public void set_form_action (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_form_enctype")]+		public void set_form_enctype (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_form_method")]+		public void set_form_method (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_form_no_validate")]+		public void set_form_no_validate (bool value);+		[CCode (cname = "webkit_dom_html_input_element_set_form_target")]+		public void set_form_target (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_incremental")]+		public void set_incremental (bool value);+		[CCode (cname = "webkit_dom_html_input_element_set_indeterminate")]+		public void set_indeterminate (bool value);+		[CCode (cname = "webkit_dom_html_input_element_set_max")]+		public void set_max (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_max_length")]+		public void set_max_length (long value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_input_element_set_min")]+		public void set_min (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_multiple")]+		public void set_multiple (bool value);+		[CCode (cname = "webkit_dom_html_input_element_set_name")]+		public void set_name (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_pattern")]+		public void set_pattern (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_placeholder")]+		public void set_placeholder (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_read_only")]+		public void set_read_only (bool value);+		[CCode (cname = "webkit_dom_html_input_element_set_required")]+		public void set_required (bool value);+		[CCode (cname = "webkit_dom_html_input_element_set_size")]+		public void set_size (ulong value);+		[CCode (cname = "webkit_dom_html_input_element_set_src")]+		public void set_src (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_step")]+		public void set_step (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_use_map")]+		public void set_use_map (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_value")]+		public void set_value (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_value_as_number")]+		public void set_value_as_number (double value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_input_element_set_value_for_user")]+		public void set_value_for_user (string value);+		[CCode (cname = "webkit_dom_html_input_element_set_webkit_grammar")]+		public void set_webkit_grammar (bool value);+		[CCode (cname = "webkit_dom_html_input_element_set_webkit_speech")]+		public void set_webkit_speech (bool value);+		[CCode (cname = "webkit_dom_html_input_element_set_webkitdirectory")]+		public void set_webkitdirectory (bool value);+		[CCode (cname = "webkit_dom_html_input_element_step_down")]+		public void step_down (long n) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_input_element_step_up")]+		public void step_up (long n) throws GLib.Error;+		public string accept { get; set; }+		public string access_key { get; set; }+		public string align { get; set; }+		public string alt { get; set; }+		public string autocomplete { get; set; }+		public bool autofocus { get; set; }+		public bool checked { get; set; }+		public bool default_checked { get; set; }+		public string default_value { get; set; }+		public bool disabled { get; set; }+		public WebKit.DOMFileList files { get; }+		public WebKit.DOMHTMLFormElement form { get; }+		public string form_action { get; set; }+		public string form_enctype { get; set; }+		public string form_method { get; set; }+		public bool form_no_validate { get; set; }+		public string form_target { get; set; }+		public bool incremental { get; set; }+		public bool indeterminate { get; set; }+		public WebKit.DOMNodeList labels { get; }+		public WebKit.DOMHTMLElement list { get; }+		public string max { get; set; }+		public long max_length { get; set; }+		public string min { get; set; }+		public bool multiple { get; set; }+		public string name { get; set; }+		public string pattern { get; set; }+		public string placeholder { get; set; }+		public bool read_only { get; set; }+		public bool required { get; set; }+		public WebKit.DOMHTMLOptionElement selected_option { get; }+		public ulong size { get; set; }+		public string src { get; set; }+		public string step { get; set; }+		[NoAccessorMethod]+		public string type { owned get; set; }+		public string use_map { get; set; }+		public string validation_message { get; }+		public WebKit.DOMValidityState validity { get; }+		public string value { get; set; }+		public double value_as_number { get; set; }+		public bool will_validate { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLIsIndexElement : WebKit.DOMHTMLInputElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLIsIndexElement ();+		[CCode (cname = "webkit_dom_html_is_index_element_get_form")]+		public unowned WebKit.DOMHTMLFormElement get_form ();+		[CCode (cname = "webkit_dom_html_is_index_element_get_prompt")]+		public unowned string get_prompt ();+		[CCode (cname = "webkit_dom_html_is_index_element_set_prompt")]+		public void set_prompt (string value);+		public WebKit.DOMHTMLFormElement form { get; }+		public string prompt { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLKeygenElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLKeygenElement ();+		[CCode (cname = "webkit_dom_html_keygen_element_check_validity")]+		public bool check_validity ();+		[CCode (cname = "webkit_dom_html_keygen_element_get_autofocus")]+		public bool get_autofocus ();+		[CCode (cname = "webkit_dom_html_keygen_element_get_challenge")]+		public unowned string get_challenge ();+		[CCode (cname = "webkit_dom_html_keygen_element_get_disabled")]+		public bool get_disabled ();+		[CCode (cname = "webkit_dom_html_keygen_element_get_form")]+		public unowned WebKit.DOMHTMLFormElement get_form ();+		[CCode (cname = "webkit_dom_html_keygen_element_get_keytype")]+		public unowned string get_keytype ();+		[CCode (cname = "webkit_dom_html_keygen_element_get_labels")]+		public unowned WebKit.DOMNodeList get_labels ();+		[CCode (cname = "webkit_dom_html_keygen_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_keygen_element_get_validation_message")]+		public unowned string get_validation_message ();+		[CCode (cname = "webkit_dom_html_keygen_element_get_validity")]+		public unowned WebKit.DOMValidityState get_validity ();+		[CCode (cname = "webkit_dom_html_keygen_element_get_will_validate")]+		public bool get_will_validate ();+		[CCode (cname = "webkit_dom_html_keygen_element_set_autofocus")]+		public void set_autofocus (bool value);+		[CCode (cname = "webkit_dom_html_keygen_element_set_challenge")]+		public void set_challenge (string value);+		[CCode (cname = "webkit_dom_html_keygen_element_set_custom_validity")]+		public void set_custom_validity (string error);+		[CCode (cname = "webkit_dom_html_keygen_element_set_disabled")]+		public void set_disabled (bool value);+		[CCode (cname = "webkit_dom_html_keygen_element_set_keytype")]+		public void set_keytype (string value);+		[CCode (cname = "webkit_dom_html_keygen_element_set_name")]+		public void set_name (string value);+		public bool autofocus { get; set; }+		public string challenge { get; set; }+		public bool disabled { get; set; }+		public WebKit.DOMHTMLFormElement form { get; }+		public string keytype { get; set; }+		public WebKit.DOMNodeList labels { get; }+		public string name { get; set; }+		[NoAccessorMethod]+		public string type { owned get; }+		public string validation_message { get; }+		public WebKit.DOMValidityState validity { get; }+		public bool will_validate { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLLIElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLLIElement ();+		[CCode (cname = "webkit_dom_htmlli_element_get_value")]+		public long get_value ();+		[CCode (cname = "webkit_dom_htmlli_element_set_value")]+		public void set_value (long value);+		[NoAccessorMethod]+		public string type { owned get; set; }+		public long value { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLLabelElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLLabelElement ();+		[CCode (cname = "webkit_dom_html_label_element_get_access_key")]+		public unowned string get_access_key ();+		[CCode (cname = "webkit_dom_html_label_element_get_control")]+		public unowned WebKit.DOMHTMLElement get_control ();+		[CCode (cname = "webkit_dom_html_label_element_get_form")]+		public unowned WebKit.DOMHTMLFormElement get_form ();+		[CCode (cname = "webkit_dom_html_label_element_get_html_for")]+		public unowned string get_html_for ();+		[CCode (cname = "webkit_dom_html_label_element_set_access_key")]+		public void set_access_key (string value);+		[CCode (cname = "webkit_dom_html_label_element_set_html_for")]+		public void set_html_for (string value);+		public string access_key { get; set; }+		public WebKit.DOMHTMLElement control { get; }+		public WebKit.DOMHTMLFormElement form { get; }+		public string html_for { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLLegendElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLLegendElement ();+		[CCode (cname = "webkit_dom_html_legend_element_get_access_key")]+		public unowned string get_access_key ();+		[CCode (cname = "webkit_dom_html_legend_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_legend_element_get_form")]+		public unowned WebKit.DOMHTMLFormElement get_form ();+		[CCode (cname = "webkit_dom_html_legend_element_set_access_key")]+		public void set_access_key (string value);+		[CCode (cname = "webkit_dom_html_legend_element_set_align")]+		public void set_align (string value);+		public string access_key { get; set; }+		public string align { get; set; }+		public WebKit.DOMHTMLFormElement form { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLLinkElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLLinkElement ();+		[CCode (cname = "webkit_dom_html_link_element_get_charset")]+		public unowned string get_charset ();+		[CCode (cname = "webkit_dom_html_link_element_get_disabled")]+		public bool get_disabled ();+		[CCode (cname = "webkit_dom_html_link_element_get_href")]+		public unowned string get_href ();+		[CCode (cname = "webkit_dom_html_link_element_get_hreflang")]+		public unowned string get_hreflang ();+		[CCode (cname = "webkit_dom_html_link_element_get_media")]+		public unowned string get_media ();+		[CCode (cname = "webkit_dom_html_link_element_get_rel")]+		public unowned string get_rel ();+		[CCode (cname = "webkit_dom_html_link_element_get_rev")]+		public unowned string get_rev ();+		[CCode (cname = "webkit_dom_html_link_element_get_sheet")]+		public unowned WebKit.DOMStyleSheet get_sheet ();+		[CCode (cname = "webkit_dom_html_link_element_get_target")]+		public unowned string get_target ();+		[CCode (cname = "webkit_dom_html_link_element_set_charset")]+		public void set_charset (string value);+		[CCode (cname = "webkit_dom_html_link_element_set_disabled")]+		public void set_disabled (bool value);+		[CCode (cname = "webkit_dom_html_link_element_set_href")]+		public void set_href (string value);+		[CCode (cname = "webkit_dom_html_link_element_set_hreflang")]+		public void set_hreflang (string value);+		[CCode (cname = "webkit_dom_html_link_element_set_media")]+		public void set_media (string value);+		[CCode (cname = "webkit_dom_html_link_element_set_rel")]+		public void set_rel (string value);+		[CCode (cname = "webkit_dom_html_link_element_set_rev")]+		public void set_rev (string value);+		[CCode (cname = "webkit_dom_html_link_element_set_target")]+		public void set_target (string value);+		public string charset { get; set; }+		public bool disabled { get; set; }+		public string href { get; set; }+		public string hreflang { get; set; }+		public string media { get; set; }+		public string rel { get; set; }+		public string rev { get; set; }+		public WebKit.DOMStyleSheet sheet { get; }+		public string target { get; set; }+		[NoAccessorMethod]+		public string type { owned get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLMapElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLMapElement ();+		[CCode (cname = "webkit_dom_html_map_element_get_areas")]+		public unowned WebKit.DOMHTMLCollection get_areas ();+		[CCode (cname = "webkit_dom_html_map_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_map_element_set_name")]+		public void set_name (string value);+		public WebKit.DOMHTMLCollection areas { get; }+		public string name { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLMarqueeElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLMarqueeElement ();+		[CCode (cname = "webkit_dom_html_marquee_element_get_behavior")]+		public unowned string get_behavior ();+		[CCode (cname = "webkit_dom_html_marquee_element_get_bg_color")]+		public unowned string get_bg_color ();+		[CCode (cname = "webkit_dom_html_marquee_element_get_direction")]+		public unowned string get_direction ();+		[CCode (cname = "webkit_dom_html_marquee_element_get_height")]+		public unowned string get_height ();+		[CCode (cname = "webkit_dom_html_marquee_element_get_hspace")]+		public ulong get_hspace ();+		[CCode (cname = "webkit_dom_html_marquee_element_get_loop")]+		public long get_loop ();+		[CCode (cname = "webkit_dom_html_marquee_element_get_scroll_amount")]+		public long get_scroll_amount ();+		[CCode (cname = "webkit_dom_html_marquee_element_get_scroll_delay")]+		public long get_scroll_delay ();+		[CCode (cname = "webkit_dom_html_marquee_element_get_true_speed")]+		public bool get_true_speed ();+		[CCode (cname = "webkit_dom_html_marquee_element_get_vspace")]+		public ulong get_vspace ();+		[CCode (cname = "webkit_dom_html_marquee_element_get_width")]+		public unowned string get_width ();+		[CCode (cname = "webkit_dom_html_marquee_element_set_behavior")]+		public void set_behavior (string value);+		[CCode (cname = "webkit_dom_html_marquee_element_set_bg_color")]+		public void set_bg_color (string value);+		[CCode (cname = "webkit_dom_html_marquee_element_set_direction")]+		public void set_direction (string value);+		[CCode (cname = "webkit_dom_html_marquee_element_set_height")]+		public void set_height (string value);+		[CCode (cname = "webkit_dom_html_marquee_element_set_hspace")]+		public void set_hspace (ulong value);+		[CCode (cname = "webkit_dom_html_marquee_element_set_loop")]+		public void set_loop (long value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_marquee_element_set_scroll_amount")]+		public void set_scroll_amount (long value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_marquee_element_set_scroll_delay")]+		public void set_scroll_delay (long value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_marquee_element_set_true_speed")]+		public void set_true_speed (bool value);+		[CCode (cname = "webkit_dom_html_marquee_element_set_vspace")]+		public void set_vspace (ulong value);+		[CCode (cname = "webkit_dom_html_marquee_element_set_width")]+		public void set_width (string value);+		[CCode (cname = "webkit_dom_html_marquee_element_start")]+		public void start ();+		[CCode (cname = "webkit_dom_html_marquee_element_stop")]+		public void stop ();+		public string behavior { get; set; }+		public string bg_color { get; set; }+		public string direction { get; set; }+		public string height { get; set; }+		public ulong hspace { get; set; }+		public long loop { get; set; }+		public long scroll_amount { get; set; }+		public long scroll_delay { get; set; }+		public bool true_speed { get; set; }+		public ulong vspace { get; set; }+		public string width { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLMediaElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLMediaElement ();+		[CCode (cname = "webkit_dom_html_media_element_can_play_type")]+		public unowned string can_play_type (string type);+		[CCode (cname = "webkit_dom_html_media_element_get_autoplay")]+		public bool get_autoplay ();+		[CCode (cname = "webkit_dom_html_media_element_get_buffered")]+		public unowned WebKit.DOMTimeRanges get_buffered ();+		[CCode (cname = "webkit_dom_html_media_element_get_controls")]+		public bool get_controls ();+		[CCode (cname = "webkit_dom_html_media_element_get_current_src")]+		public unowned string get_current_src ();+		[CCode (cname = "webkit_dom_html_media_element_get_current_time")]+		public float get_current_time ();+		[CCode (cname = "webkit_dom_html_media_element_get_default_muted")]+		public bool get_default_muted ();+		[CCode (cname = "webkit_dom_html_media_element_get_default_playback_rate")]+		public float get_default_playback_rate ();+		[CCode (cname = "webkit_dom_html_media_element_get_duration")]+		public float get_duration ();+		[CCode (cname = "webkit_dom_html_media_element_get_ended")]+		public bool get_ended ();+		[CCode (cname = "webkit_dom_html_media_element_get_error")]+		public unowned WebKit.DOMMediaError get_error ();+		[CCode (cname = "webkit_dom_html_media_element_get_initial_time")]+		public double get_initial_time ();+		[CCode (cname = "webkit_dom_html_media_element_get_loop")]+		public bool get_loop ();+		[CCode (cname = "webkit_dom_html_media_element_get_muted")]+		public bool get_muted ();+		[CCode (cname = "webkit_dom_html_media_element_get_network_state")]+		public ushort get_network_state ();+		[CCode (cname = "webkit_dom_html_media_element_get_paused")]+		public bool get_paused ();+		[CCode (cname = "webkit_dom_html_media_element_get_playback_rate")]+		public float get_playback_rate ();+		[CCode (cname = "webkit_dom_html_media_element_get_played")]+		public unowned WebKit.DOMTimeRanges get_played ();+		[CCode (cname = "webkit_dom_html_media_element_get_preload")]+		public unowned string get_preload ();+		[CCode (cname = "webkit_dom_html_media_element_get_ready_state")]+		public ushort get_ready_state ();+		[CCode (cname = "webkit_dom_html_media_element_get_seekable")]+		public unowned WebKit.DOMTimeRanges get_seekable ();+		[CCode (cname = "webkit_dom_html_media_element_get_seeking")]+		public bool get_seeking ();+		[CCode (cname = "webkit_dom_html_media_element_get_src")]+		public unowned string get_src ();+		[CCode (cname = "webkit_dom_html_media_element_get_start_time")]+		public float get_start_time ();+		[CCode (cname = "webkit_dom_html_media_element_get_volume")]+		public float get_volume ();+		[CCode (cname = "webkit_dom_html_media_element_get_webkit_audio_decoded_byte_count")]+		public ulong get_webkit_audio_decoded_byte_count ();+		[CCode (cname = "webkit_dom_html_media_element_get_webkit_closed_captions_visible")]+		public bool get_webkit_closed_captions_visible ();+		[CCode (cname = "webkit_dom_html_media_element_get_webkit_has_closed_captions")]+		public bool get_webkit_has_closed_captions ();+		[CCode (cname = "webkit_dom_html_media_element_get_webkit_preserves_pitch")]+		public bool get_webkit_preserves_pitch ();+		[CCode (cname = "webkit_dom_html_media_element_get_webkit_video_decoded_byte_count")]+		public ulong get_webkit_video_decoded_byte_count ();+		[CCode (cname = "webkit_dom_html_media_element_load")]+		public void load () throws GLib.Error;+		[CCode (cname = "webkit_dom_html_media_element_pause")]+		public void pause ();+		[CCode (cname = "webkit_dom_html_media_element_play")]+		public void play ();+		[CCode (cname = "webkit_dom_html_media_element_set_autoplay")]+		public void set_autoplay (bool value);+		[CCode (cname = "webkit_dom_html_media_element_set_controls")]+		public void set_controls (bool value);+		[CCode (cname = "webkit_dom_html_media_element_set_current_time")]+		public void set_current_time (float value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_media_element_set_default_muted")]+		public void set_default_muted (bool value);+		[CCode (cname = "webkit_dom_html_media_element_set_default_playback_rate")]+		public void set_default_playback_rate (float value);+		[CCode (cname = "webkit_dom_html_media_element_set_loop")]+		public void set_loop (bool value);+		[CCode (cname = "webkit_dom_html_media_element_set_muted")]+		public void set_muted (bool value);+		[CCode (cname = "webkit_dom_html_media_element_set_playback_rate")]+		public void set_playback_rate (float value);+		[CCode (cname = "webkit_dom_html_media_element_set_preload")]+		public void set_preload (string value);+		[CCode (cname = "webkit_dom_html_media_element_set_src")]+		public void set_src (string value);+		[CCode (cname = "webkit_dom_html_media_element_set_volume")]+		public void set_volume (float value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_media_element_set_webkit_closed_captions_visible")]+		public void set_webkit_closed_captions_visible (bool value);+		[CCode (cname = "webkit_dom_html_media_element_set_webkit_preserves_pitch")]+		public void set_webkit_preserves_pitch (bool value);+		public bool autoplay { get; set; }+		public WebKit.DOMTimeRanges buffered { get; }+		public bool controls { get; set; }+		public string current_src { get; }+		public float current_time { get; set; }+		public bool default_muted { get; set; }+		public float default_playback_rate { get; set; }+		public float duration { get; }+		public bool ended { get; }+		public WebKit.DOMMediaError error { get; }+		public double initial_time { get; }+		public bool loop { get; set; }+		public bool muted { get; set; }+		public uint network_state { get; }+		public bool paused { get; }+		public float playback_rate { get; set; }+		public WebKit.DOMTimeRanges played { get; }+		public string preload { get; set; }+		public uint ready_state { get; }+		public WebKit.DOMTimeRanges seekable { get; }+		public bool seeking { get; }+		public string src { get; set; }+		public float start_time { get; }+		public float volume { get; set; }+		public bool webkit_closed_captions_visible { get; set; }+		public bool webkit_has_closed_captions { get; }+		public bool webkit_preserves_pitch { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLMenuElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLMenuElement ();+		[CCode (cname = "webkit_dom_html_menu_element_get_compact")]+		public bool get_compact ();+		[CCode (cname = "webkit_dom_html_menu_element_set_compact")]+		public void set_compact (bool value);+		public bool compact { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLMetaElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLMetaElement ();+		[CCode (cname = "webkit_dom_html_meta_element_get_content")]+		public unowned string get_content ();+		[CCode (cname = "webkit_dom_html_meta_element_get_http_equiv")]+		public unowned string get_http_equiv ();+		[CCode (cname = "webkit_dom_html_meta_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_meta_element_get_scheme")]+		public unowned string get_scheme ();+		[CCode (cname = "webkit_dom_html_meta_element_set_content")]+		public void set_content (string value);+		[CCode (cname = "webkit_dom_html_meta_element_set_http_equiv")]+		public void set_http_equiv (string value);+		[CCode (cname = "webkit_dom_html_meta_element_set_name")]+		public void set_name (string value);+		[CCode (cname = "webkit_dom_html_meta_element_set_scheme")]+		public void set_scheme (string value);+		public string content { get; set; }+		public string http_equiv { get; set; }+		public string name { get; set; }+		public string scheme { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLModElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLModElement ();+		[CCode (cname = "webkit_dom_html_mod_element_get_cite")]+		public unowned string get_cite ();+		[CCode (cname = "webkit_dom_html_mod_element_get_date_time")]+		public unowned string get_date_time ();+		[CCode (cname = "webkit_dom_html_mod_element_set_cite")]+		public void set_cite (string value);+		[CCode (cname = "webkit_dom_html_mod_element_set_date_time")]+		public void set_date_time (string value);+		public string cite { get; set; }+		public string date_time { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLOListElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLOListElement ();+		[CCode (cname = "webkit_dom_htmlo_list_element_get_compact")]+		public bool get_compact ();+		[CCode (cname = "webkit_dom_htmlo_list_element_get_start")]+		public long get_start ();+		[CCode (cname = "webkit_dom_htmlo_list_element_set_compact")]+		public void set_compact (bool value);+		[CCode (cname = "webkit_dom_htmlo_list_element_set_start")]+		public void set_start (long value);+		public bool compact { get; set; }+		public long start { get; set; }+		[NoAccessorMethod]+		public string type { owned get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLObjectElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLObjectElement ();+		[CCode (cname = "webkit_dom_html_object_element_check_validity")]+		public bool check_validity ();+		[CCode (cname = "webkit_dom_html_object_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_object_element_get_archive")]+		public unowned string get_archive ();+		[CCode (cname = "webkit_dom_html_object_element_get_border")]+		public unowned string get_border ();+		[CCode (cname = "webkit_dom_html_object_element_get_code")]+		public unowned string get_code ();+		[CCode (cname = "webkit_dom_html_object_element_get_code_base")]+		public unowned string get_code_base ();+		[CCode (cname = "webkit_dom_html_object_element_get_code_type")]+		public unowned string get_code_type ();+		[CCode (cname = "webkit_dom_html_object_element_get_content_document")]+		public unowned WebKit.DOMDocument get_content_document ();+		[CCode (cname = "webkit_dom_html_object_element_get_data")]+		public unowned string get_data ();+		[CCode (cname = "webkit_dom_html_object_element_get_declare")]+		public bool get_declare ();+		[CCode (cname = "webkit_dom_html_object_element_get_form")]+		public unowned WebKit.DOMHTMLFormElement get_form ();+		[CCode (cname = "webkit_dom_html_object_element_get_height")]+		public unowned string get_height ();+		[CCode (cname = "webkit_dom_html_object_element_get_hspace")]+		public long get_hspace ();+		[CCode (cname = "webkit_dom_html_object_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_object_element_get_standby")]+		public unowned string get_standby ();+		[CCode (cname = "webkit_dom_html_object_element_get_use_map")]+		public unowned string get_use_map ();+		[CCode (cname = "webkit_dom_html_object_element_get_validation_message")]+		public unowned string get_validation_message ();+		[CCode (cname = "webkit_dom_html_object_element_get_validity")]+		public unowned WebKit.DOMValidityState get_validity ();+		[CCode (cname = "webkit_dom_html_object_element_get_vspace")]+		public long get_vspace ();+		[CCode (cname = "webkit_dom_html_object_element_get_width")]+		public unowned string get_width ();+		[CCode (cname = "webkit_dom_html_object_element_get_will_validate")]+		public bool get_will_validate ();+		[CCode (cname = "webkit_dom_html_object_element_set_align")]+		public void set_align (string value);+		[CCode (cname = "webkit_dom_html_object_element_set_archive")]+		public void set_archive (string value);+		[CCode (cname = "webkit_dom_html_object_element_set_border")]+		public void set_border (string value);+		[CCode (cname = "webkit_dom_html_object_element_set_code")]+		public void set_code (string value);+		[CCode (cname = "webkit_dom_html_object_element_set_code_base")]+		public void set_code_base (string value);+		[CCode (cname = "webkit_dom_html_object_element_set_code_type")]+		public void set_code_type (string value);+		[CCode (cname = "webkit_dom_html_object_element_set_custom_validity")]+		public void set_custom_validity (string error);+		[CCode (cname = "webkit_dom_html_object_element_set_data")]+		public void set_data (string value);+		[CCode (cname = "webkit_dom_html_object_element_set_declare")]+		public void set_declare (bool value);+		[CCode (cname = "webkit_dom_html_object_element_set_height")]+		public void set_height (string value);+		[CCode (cname = "webkit_dom_html_object_element_set_hspace")]+		public void set_hspace (long value);+		[CCode (cname = "webkit_dom_html_object_element_set_name")]+		public void set_name (string value);+		[CCode (cname = "webkit_dom_html_object_element_set_standby")]+		public void set_standby (string value);+		[CCode (cname = "webkit_dom_html_object_element_set_use_map")]+		public void set_use_map (string value);+		[CCode (cname = "webkit_dom_html_object_element_set_vspace")]+		public void set_vspace (long value);+		[CCode (cname = "webkit_dom_html_object_element_set_width")]+		public void set_width (string value);+		public string align { get; set; }+		public string archive { get; set; }+		public string border { get; set; }+		public string code { get; set; }+		public string code_base { get; set; }+		public string code_type { get; set; }+		public WebKit.DOMDocument content_document { get; }+		public string data { get; set; }+		public bool declare { get; set; }+		public WebKit.DOMHTMLFormElement form { get; }+		public string height { get; set; }+		public long hspace { get; set; }+		public string name { get; set; }+		public string standby { get; set; }+		[NoAccessorMethod]+		public string type { owned get; set; }+		public string use_map { get; set; }+		public string validation_message { get; }+		public WebKit.DOMValidityState validity { get; }+		public long vspace { get; set; }+		public string width { get; set; }+		public bool will_validate { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLOptGroupElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLOptGroupElement ();+		[CCode (cname = "webkit_dom_html_opt_group_element_get_disabled")]+		public bool get_disabled ();+		[CCode (cname = "webkit_dom_html_opt_group_element_get_label")]+		public unowned string get_label ();+		[CCode (cname = "webkit_dom_html_opt_group_element_set_disabled")]+		public void set_disabled (bool value);+		[CCode (cname = "webkit_dom_html_opt_group_element_set_label")]+		public void set_label (string value);+		public bool disabled { get; set; }+		public string label { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLOptionElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLOptionElement ();+		[CCode (cname = "webkit_dom_html_option_element_get_default_selected")]+		public bool get_default_selected ();+		[CCode (cname = "webkit_dom_html_option_element_get_disabled")]+		public bool get_disabled ();+		[CCode (cname = "webkit_dom_html_option_element_get_form")]+		public unowned WebKit.DOMHTMLFormElement get_form ();+		[CCode (cname = "webkit_dom_html_option_element_get_index")]+		public long get_index ();+		[CCode (cname = "webkit_dom_html_option_element_get_label")]+		public unowned string get_label ();+		[CCode (cname = "webkit_dom_html_option_element_get_selected")]+		public bool get_selected ();+		[CCode (cname = "webkit_dom_html_option_element_get_text")]+		public unowned string get_text ();+		[CCode (cname = "webkit_dom_html_option_element_get_value")]+		public unowned string get_value ();+		[CCode (cname = "webkit_dom_html_option_element_set_default_selected")]+		public void set_default_selected (bool value);+		[CCode (cname = "webkit_dom_html_option_element_set_disabled")]+		public void set_disabled (bool value);+		[CCode (cname = "webkit_dom_html_option_element_set_label")]+		public void set_label (string value);+		[CCode (cname = "webkit_dom_html_option_element_set_selected")]+		public void set_selected (bool value);+		[CCode (cname = "webkit_dom_html_option_element_set_value")]+		public void set_value (string value);+		public bool default_selected { get; set; }+		public bool disabled { get; set; }+		public WebKit.DOMHTMLFormElement form { get; }+		public long index { get; }+		public string label { get; set; }+		public bool selected { get; set; }+		public string text { get; }+		public string value { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLOptionsCollection : WebKit.DOMHTMLCollection {+		[CCode (has_construct_function = false)]+		protected DOMHTMLOptionsCollection ();+		[CCode (cname = "webkit_dom_html_options_collection_get_selected_index")]+		public long get_selected_index ();+		[CCode (cname = "webkit_dom_html_options_collection_set_selected_index")]+		public void set_selected_index (long value);+		public long selected_index { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLParagraphElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLParagraphElement ();+		[CCode (cname = "webkit_dom_html_paragraph_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_paragraph_element_set_align")]+		public void set_align (string value);+		public string align { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLParamElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLParamElement ();+		[CCode (cname = "webkit_dom_html_param_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_param_element_get_value")]+		public unowned string get_value ();+		[CCode (cname = "webkit_dom_html_param_element_get_value_type")]+		public unowned string get_value_type ();+		[CCode (cname = "webkit_dom_html_param_element_set_name")]+		public void set_name (string value);+		[CCode (cname = "webkit_dom_html_param_element_set_value")]+		public void set_value (string value);+		[CCode (cname = "webkit_dom_html_param_element_set_value_type")]+		public void set_value_type (string value);+		public string name { get; set; }+		[NoAccessorMethod]+		public string type { owned get; set; }+		public string value { get; set; }+		public string value_type { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLPreElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLPreElement ();+		[CCode (cname = "webkit_dom_html_pre_element_get_width")]+		public long get_width ();+		[CCode (cname = "webkit_dom_html_pre_element_get_wrap")]+		public bool get_wrap ();+		[CCode (cname = "webkit_dom_html_pre_element_set_width")]+		public void set_width (long value);+		[CCode (cname = "webkit_dom_html_pre_element_set_wrap")]+		public void set_wrap (bool value);+		public long width { get; set; }+		public bool wrap { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLQuoteElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLQuoteElement ();+		[CCode (cname = "webkit_dom_html_quote_element_get_cite")]+		public unowned string get_cite ();+		[CCode (cname = "webkit_dom_html_quote_element_set_cite")]+		public void set_cite (string value);+		public string cite { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLScriptElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLScriptElement ();+		[CCode (cname = "webkit_dom_html_script_element_get_async")]+		public bool get_async ();+		[CCode (cname = "webkit_dom_html_script_element_get_charset")]+		public unowned string get_charset ();+		[CCode (cname = "webkit_dom_html_script_element_get_defer")]+		public bool get_defer ();+		[CCode (cname = "webkit_dom_html_script_element_get_event")]+		public unowned string get_event ();+		[CCode (cname = "webkit_dom_html_script_element_get_html_for")]+		public unowned string get_html_for ();+		[CCode (cname = "webkit_dom_html_script_element_get_src")]+		public unowned string get_src ();+		[CCode (cname = "webkit_dom_html_script_element_get_text")]+		public unowned string get_text ();+		[CCode (cname = "webkit_dom_html_script_element_set_async")]+		public void set_async (bool value);+		[CCode (cname = "webkit_dom_html_script_element_set_charset")]+		public void set_charset (string value);+		[CCode (cname = "webkit_dom_html_script_element_set_defer")]+		public void set_defer (bool value);+		[CCode (cname = "webkit_dom_html_script_element_set_event")]+		public void set_event (string value);+		[CCode (cname = "webkit_dom_html_script_element_set_html_for")]+		public void set_html_for (string value);+		[CCode (cname = "webkit_dom_html_script_element_set_src")]+		public void set_src (string value);+		[CCode (cname = "webkit_dom_html_script_element_set_text")]+		public void set_text (string value);+		public bool @async { get; set; }+		public string charset { get; set; }+		public bool defer { get; set; }+		public string event { get; set; }+		public string html_for { get; set; }+		public string src { get; set; }+		public string text { get; set; }+		[NoAccessorMethod]+		public string type { owned get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLSelectElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLSelectElement ();+		[CCode (cname = "webkit_dom_html_select_element_add")]+		public void add (WebKit.DOMHTMLElement element, WebKit.DOMHTMLElement before) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_select_element_check_validity")]+		public bool check_validity ();+		[CCode (cname = "webkit_dom_html_select_element_get_autofocus")]+		public bool get_autofocus ();+		[CCode (cname = "webkit_dom_html_select_element_get_disabled")]+		public bool get_disabled ();+		[CCode (cname = "webkit_dom_html_select_element_get_form")]+		public unowned WebKit.DOMHTMLFormElement get_form ();+		[CCode (cname = "webkit_dom_html_select_element_get_labels")]+		public unowned WebKit.DOMNodeList get_labels ();+		[CCode (cname = "webkit_dom_html_select_element_get_length")]+		public ulong get_length ();+		[CCode (cname = "webkit_dom_html_select_element_get_multiple")]+		public bool get_multiple ();+		[CCode (cname = "webkit_dom_html_select_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_select_element_get_options")]+		public unowned WebKit.DOMHTMLOptionsCollection get_options ();+		[CCode (cname = "webkit_dom_html_select_element_get_required")]+		public bool get_required ();+		[CCode (cname = "webkit_dom_html_select_element_get_selected_index")]+		public long get_selected_index ();+		[CCode (cname = "webkit_dom_html_select_element_get_size")]+		public long get_size ();+		[CCode (cname = "webkit_dom_html_select_element_get_validation_message")]+		public unowned string get_validation_message ();+		[CCode (cname = "webkit_dom_html_select_element_get_validity")]+		public unowned WebKit.DOMValidityState get_validity ();+		[CCode (cname = "webkit_dom_html_select_element_get_value")]+		public unowned string get_value ();+		[CCode (cname = "webkit_dom_html_select_element_get_will_validate")]+		public bool get_will_validate ();+		[CCode (cname = "webkit_dom_html_select_element_item")]+		public unowned WebKit.DOMNode item (ulong index);+		[CCode (cname = "webkit_dom_html_select_element_named_item")]+		public unowned WebKit.DOMNode named_item (string name);+		[CCode (cname = "webkit_dom_html_select_element_remove")]+		public void remove (long index);+		[CCode (cname = "webkit_dom_html_select_element_set_autofocus")]+		public void set_autofocus (bool value);+		[CCode (cname = "webkit_dom_html_select_element_set_custom_validity")]+		public void set_custom_validity (string error);+		[CCode (cname = "webkit_dom_html_select_element_set_disabled")]+		public void set_disabled (bool value);+		[CCode (cname = "webkit_dom_html_select_element_set_length")]+		public void set_length (ulong value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_select_element_set_multiple")]+		public void set_multiple (bool value);+		[CCode (cname = "webkit_dom_html_select_element_set_name")]+		public void set_name (string value);+		[CCode (cname = "webkit_dom_html_select_element_set_required")]+		public void set_required (bool value);+		[CCode (cname = "webkit_dom_html_select_element_set_selected_index")]+		public void set_selected_index (long value);+		[CCode (cname = "webkit_dom_html_select_element_set_size")]+		public void set_size (long value);+		[CCode (cname = "webkit_dom_html_select_element_set_value")]+		public void set_value (string value);+		public bool autofocus { get; set; }+		public bool disabled { get; set; }+		public WebKit.DOMHTMLFormElement form { get; }+		public WebKit.DOMNodeList labels { get; }+		public ulong length { get; set; }+		public bool multiple { get; set; }+		public string name { get; set; }+		public WebKit.DOMHTMLOptionsCollection options { get; }+		public bool required { get; set; }+		public long selected_index { get; set; }+		public long size { get; set; }+		[NoAccessorMethod]+		public string type { owned get; }+		public string validation_message { get; }+		public WebKit.DOMValidityState validity { get; }+		public string value { get; set; }+		public bool will_validate { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLStyleElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLStyleElement ();+		[CCode (cname = "webkit_dom_html_style_element_get_disabled")]+		public bool get_disabled ();+		[CCode (cname = "webkit_dom_html_style_element_get_media")]+		public unowned string get_media ();+		[CCode (cname = "webkit_dom_html_style_element_get_sheet")]+		public unowned WebKit.DOMStyleSheet get_sheet ();+		[CCode (cname = "webkit_dom_html_style_element_set_disabled")]+		public void set_disabled (bool value);+		[CCode (cname = "webkit_dom_html_style_element_set_media")]+		public void set_media (string value);+		public bool disabled { get; set; }+		public string media { get; set; }+		public WebKit.DOMStyleSheet sheet { get; }+		[NoAccessorMethod]+		public string type { owned get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLTableCaptionElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLTableCaptionElement ();+		[CCode (cname = "webkit_dom_html_table_caption_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_table_caption_element_set_align")]+		public void set_align (string value);+		public string align { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLTableCellElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLTableCellElement ();+		[CCode (cname = "webkit_dom_html_table_cell_element_get_abbr")]+		public unowned string get_abbr ();+		[CCode (cname = "webkit_dom_html_table_cell_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_table_cell_element_get_axis")]+		public unowned string get_axis ();+		[CCode (cname = "webkit_dom_html_table_cell_element_get_bg_color")]+		public unowned string get_bg_color ();+		[CCode (cname = "webkit_dom_html_table_cell_element_get_cell_index")]+		public long get_cell_index ();+		[CCode (cname = "webkit_dom_html_table_cell_element_get_ch")]+		public unowned string get_ch ();+		[CCode (cname = "webkit_dom_html_table_cell_element_get_ch_off")]+		public unowned string get_ch_off ();+		[CCode (cname = "webkit_dom_html_table_cell_element_get_col_span")]+		public long get_col_span ();+		[CCode (cname = "webkit_dom_html_table_cell_element_get_headers")]+		public unowned string get_headers ();+		[CCode (cname = "webkit_dom_html_table_cell_element_get_height")]+		public unowned string get_height ();+		[CCode (cname = "webkit_dom_html_table_cell_element_get_no_wrap")]+		public bool get_no_wrap ();+		[CCode (cname = "webkit_dom_html_table_cell_element_get_row_span")]+		public long get_row_span ();+		[CCode (cname = "webkit_dom_html_table_cell_element_get_scope")]+		public unowned string get_scope ();+		[CCode (cname = "webkit_dom_html_table_cell_element_get_v_align")]+		public unowned string get_v_align ();+		[CCode (cname = "webkit_dom_html_table_cell_element_get_width")]+		public unowned string get_width ();+		[CCode (cname = "webkit_dom_html_table_cell_element_set_abbr")]+		public void set_abbr (string value);+		[CCode (cname = "webkit_dom_html_table_cell_element_set_align")]+		public void set_align (string value);+		[CCode (cname = "webkit_dom_html_table_cell_element_set_axis")]+		public void set_axis (string value);+		[CCode (cname = "webkit_dom_html_table_cell_element_set_bg_color")]+		public void set_bg_color (string value);+		[CCode (cname = "webkit_dom_html_table_cell_element_set_ch")]+		public void set_ch (string value);+		[CCode (cname = "webkit_dom_html_table_cell_element_set_ch_off")]+		public void set_ch_off (string value);+		[CCode (cname = "webkit_dom_html_table_cell_element_set_col_span")]+		public void set_col_span (long value);+		[CCode (cname = "webkit_dom_html_table_cell_element_set_headers")]+		public void set_headers (string value);+		[CCode (cname = "webkit_dom_html_table_cell_element_set_height")]+		public void set_height (string value);+		[CCode (cname = "webkit_dom_html_table_cell_element_set_no_wrap")]+		public void set_no_wrap (bool value);+		[CCode (cname = "webkit_dom_html_table_cell_element_set_row_span")]+		public void set_row_span (long value);+		[CCode (cname = "webkit_dom_html_table_cell_element_set_scope")]+		public void set_scope (string value);+		[CCode (cname = "webkit_dom_html_table_cell_element_set_v_align")]+		public void set_v_align (string value);+		[CCode (cname = "webkit_dom_html_table_cell_element_set_width")]+		public void set_width (string value);+		public string abbr { get; set; }+		public string align { get; set; }+		public string axis { get; set; }+		public string bg_color { get; set; }+		public long cell_index { get; }+		public string ch { get; set; }+		public string ch_off { get; set; }+		public long col_span { get; set; }+		public string headers { get; set; }+		public string height { get; set; }+		public bool no_wrap { get; set; }+		public long row_span { get; set; }+		public string scope { get; set; }+		public string v_align { get; set; }+		public string width { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLTableColElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLTableColElement ();+		[CCode (cname = "webkit_dom_html_table_col_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_table_col_element_get_ch")]+		public unowned string get_ch ();+		[CCode (cname = "webkit_dom_html_table_col_element_get_ch_off")]+		public unowned string get_ch_off ();+		[CCode (cname = "webkit_dom_html_table_col_element_get_span")]+		public long get_span ();+		[CCode (cname = "webkit_dom_html_table_col_element_get_v_align")]+		public unowned string get_v_align ();+		[CCode (cname = "webkit_dom_html_table_col_element_get_width")]+		public unowned string get_width ();+		[CCode (cname = "webkit_dom_html_table_col_element_set_align")]+		public void set_align (string value);+		[CCode (cname = "webkit_dom_html_table_col_element_set_ch")]+		public void set_ch (string value);+		[CCode (cname = "webkit_dom_html_table_col_element_set_ch_off")]+		public void set_ch_off (string value);+		[CCode (cname = "webkit_dom_html_table_col_element_set_span")]+		public void set_span (long value);+		[CCode (cname = "webkit_dom_html_table_col_element_set_v_align")]+		public void set_v_align (string value);+		[CCode (cname = "webkit_dom_html_table_col_element_set_width")]+		public void set_width (string value);+		public string align { get; set; }+		public string ch { get; set; }+		public string ch_off { get; set; }+		public long span { get; set; }+		public string v_align { get; set; }+		public string width { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLTableElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLTableElement ();+		[CCode (cname = "webkit_dom_html_table_element_create_caption")]+		public unowned WebKit.DOMHTMLElement create_caption ();+		[CCode (cname = "webkit_dom_html_table_element_create_t_foot")]+		public unowned WebKit.DOMHTMLElement create_t_foot ();+		[CCode (cname = "webkit_dom_html_table_element_create_t_head")]+		public unowned WebKit.DOMHTMLElement create_t_head ();+		[CCode (cname = "webkit_dom_html_table_element_delete_caption")]+		public void delete_caption ();+		[CCode (cname = "webkit_dom_html_table_element_delete_row")]+		public void delete_row (long index) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_table_element_delete_t_foot")]+		public void delete_t_foot ();+		[CCode (cname = "webkit_dom_html_table_element_delete_t_head")]+		public void delete_t_head ();+		[CCode (cname = "webkit_dom_html_table_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_table_element_get_bg_color")]+		public unowned string get_bg_color ();+		[CCode (cname = "webkit_dom_html_table_element_get_border")]+		public unowned string get_border ();+		[CCode (cname = "webkit_dom_html_table_element_get_caption")]+		public unowned WebKit.DOMHTMLTableCaptionElement get_caption ();+		[CCode (cname = "webkit_dom_html_table_element_get_cell_padding")]+		public unowned string get_cell_padding ();+		[CCode (cname = "webkit_dom_html_table_element_get_cell_spacing")]+		public unowned string get_cell_spacing ();+		[CCode (cname = "webkit_dom_html_table_element_get_frame")]+		public unowned string get_frame ();+		[CCode (cname = "webkit_dom_html_table_element_get_rows")]+		public unowned WebKit.DOMHTMLCollection get_rows ();+		[CCode (cname = "webkit_dom_html_table_element_get_rules")]+		public unowned string get_rules ();+		[CCode (cname = "webkit_dom_html_table_element_get_summary")]+		public unowned string get_summary ();+		[CCode (cname = "webkit_dom_html_table_element_get_t_bodies")]+		public unowned WebKit.DOMHTMLCollection get_t_bodies ();+		[CCode (cname = "webkit_dom_html_table_element_get_t_foot")]+		public unowned WebKit.DOMHTMLTableSectionElement get_t_foot ();+		[CCode (cname = "webkit_dom_html_table_element_get_t_head")]+		public unowned WebKit.DOMHTMLTableSectionElement get_t_head ();+		[CCode (cname = "webkit_dom_html_table_element_get_width")]+		public unowned string get_width ();+		[CCode (cname = "webkit_dom_html_table_element_insert_row")]+		public unowned WebKit.DOMHTMLElement insert_row (long index) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_table_element_set_align")]+		public void set_align (string value);+		[CCode (cname = "webkit_dom_html_table_element_set_bg_color")]+		public void set_bg_color (string value);+		[CCode (cname = "webkit_dom_html_table_element_set_border")]+		public void set_border (string value);+		[CCode (cname = "webkit_dom_html_table_element_set_caption")]+		public void set_caption (WebKit.DOMHTMLTableCaptionElement value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_table_element_set_cell_padding")]+		public void set_cell_padding (string value);+		[CCode (cname = "webkit_dom_html_table_element_set_cell_spacing")]+		public void set_cell_spacing (string value);+		[CCode (cname = "webkit_dom_html_table_element_set_frame")]+		public void set_frame (string value);+		[CCode (cname = "webkit_dom_html_table_element_set_rules")]+		public void set_rules (string value);+		[CCode (cname = "webkit_dom_html_table_element_set_summary")]+		public void set_summary (string value);+		[CCode (cname = "webkit_dom_html_table_element_set_t_foot")]+		public void set_t_foot (WebKit.DOMHTMLTableSectionElement value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_table_element_set_t_head")]+		public void set_t_head (WebKit.DOMHTMLTableSectionElement value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_table_element_set_width")]+		public void set_width (string value);+		public string align { get; set; }+		public string bg_color { get; set; }+		public string border { get; set; }+		public WebKit.DOMHTMLTableCaptionElement caption { get; set; }+		public string cell_padding { get; set; }+		public string cell_spacing { get; set; }+		public string frame { get; set; }+		public WebKit.DOMHTMLCollection rows { get; }+		public string rules { get; set; }+		public string summary { get; set; }+		public WebKit.DOMHTMLCollection t_bodies { get; }+		public WebKit.DOMHTMLTableSectionElement t_foot { get; set; }+		public WebKit.DOMHTMLTableSectionElement t_head { get; set; }+		public string width { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLTableRowElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLTableRowElement ();+		[CCode (cname = "webkit_dom_html_table_row_element_delete_cell")]+		public void delete_cell (long index) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_table_row_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_table_row_element_get_bg_color")]+		public unowned string get_bg_color ();+		[CCode (cname = "webkit_dom_html_table_row_element_get_cells")]+		public unowned WebKit.DOMHTMLCollection get_cells ();+		[CCode (cname = "webkit_dom_html_table_row_element_get_ch")]+		public unowned string get_ch ();+		[CCode (cname = "webkit_dom_html_table_row_element_get_ch_off")]+		public unowned string get_ch_off ();+		[CCode (cname = "webkit_dom_html_table_row_element_get_row_index")]+		public long get_row_index ();+		[CCode (cname = "webkit_dom_html_table_row_element_get_section_row_index")]+		public long get_section_row_index ();+		[CCode (cname = "webkit_dom_html_table_row_element_get_v_align")]+		public unowned string get_v_align ();+		[CCode (cname = "webkit_dom_html_table_row_element_insert_cell")]+		public unowned WebKit.DOMHTMLElement insert_cell (long index) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_table_row_element_set_align")]+		public void set_align (string value);+		[CCode (cname = "webkit_dom_html_table_row_element_set_bg_color")]+		public void set_bg_color (string value);+		[CCode (cname = "webkit_dom_html_table_row_element_set_ch")]+		public void set_ch (string value);+		[CCode (cname = "webkit_dom_html_table_row_element_set_ch_off")]+		public void set_ch_off (string value);+		[CCode (cname = "webkit_dom_html_table_row_element_set_v_align")]+		public void set_v_align (string value);+		public string align { get; set; }+		public string bg_color { get; set; }+		public WebKit.DOMHTMLCollection cells { get; }+		public string ch { get; set; }+		public string ch_off { get; set; }+		public long row_index { get; }+		public long section_row_index { get; }+		public string v_align { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLTableSectionElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLTableSectionElement ();+		[CCode (cname = "webkit_dom_html_table_section_element_delete_row")]+		public void delete_row (long index) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_table_section_element_get_align")]+		public unowned string get_align ();+		[CCode (cname = "webkit_dom_html_table_section_element_get_ch")]+		public unowned string get_ch ();+		[CCode (cname = "webkit_dom_html_table_section_element_get_ch_off")]+		public unowned string get_ch_off ();+		[CCode (cname = "webkit_dom_html_table_section_element_get_rows")]+		public unowned WebKit.DOMHTMLCollection get_rows ();+		[CCode (cname = "webkit_dom_html_table_section_element_get_v_align")]+		public unowned string get_v_align ();+		[CCode (cname = "webkit_dom_html_table_section_element_insert_row")]+		public unowned WebKit.DOMHTMLElement insert_row (long index) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_table_section_element_set_align")]+		public void set_align (string value);+		[CCode (cname = "webkit_dom_html_table_section_element_set_ch")]+		public void set_ch (string value);+		[CCode (cname = "webkit_dom_html_table_section_element_set_ch_off")]+		public void set_ch_off (string value);+		[CCode (cname = "webkit_dom_html_table_section_element_set_v_align")]+		public void set_v_align (string value);+		public string align { get; set; }+		public string ch { get; set; }+		public string ch_off { get; set; }+		public WebKit.DOMHTMLCollection rows { get; }+		public string v_align { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLTextAreaElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLTextAreaElement ();+		[CCode (cname = "webkit_dom_html_text_area_element_check_validity")]+		public bool check_validity ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_access_key")]+		public unowned string get_access_key ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_autofocus")]+		public bool get_autofocus ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_cols")]+		public long get_cols ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_default_value")]+		public unowned string get_default_value ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_disabled")]+		public bool get_disabled ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_form")]+		public unowned WebKit.DOMHTMLFormElement get_form ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_labels")]+		public unowned WebKit.DOMNodeList get_labels ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_max_length")]+		public long get_max_length ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_placeholder")]+		public unowned string get_placeholder ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_read_only")]+		public bool get_read_only ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_required")]+		public bool get_required ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_rows")]+		public long get_rows ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_selection_direction")]+		public unowned string get_selection_direction ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_selection_end")]+		public long get_selection_end ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_selection_start")]+		public long get_selection_start ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_text_length")]+		public ulong get_text_length ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_validation_message")]+		public unowned string get_validation_message ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_validity")]+		public unowned WebKit.DOMValidityState get_validity ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_value")]+		public unowned string get_value ();+		[CCode (cname = "webkit_dom_html_text_area_element_get_will_validate")]+		public bool get_will_validate ();+		[CCode (cname = "webkit_dom_html_text_area_element_is_edited")]+		public bool is_edited ();+		[CCode (cname = "webkit_dom_html_text_area_element_select")]+		public void select ();+		[CCode (cname = "webkit_dom_html_text_area_element_set_access_key")]+		public void set_access_key (string value);+		[CCode (cname = "webkit_dom_html_text_area_element_set_autofocus")]+		public void set_autofocus (bool value);+		[CCode (cname = "webkit_dom_html_text_area_element_set_cols")]+		public void set_cols (long value);+		[CCode (cname = "webkit_dom_html_text_area_element_set_custom_validity")]+		public void set_custom_validity (string error);+		[CCode (cname = "webkit_dom_html_text_area_element_set_default_value")]+		public void set_default_value (string value);+		[CCode (cname = "webkit_dom_html_text_area_element_set_disabled")]+		public void set_disabled (bool value);+		[CCode (cname = "webkit_dom_html_text_area_element_set_max_length")]+		public void set_max_length (long value) throws GLib.Error;+		[CCode (cname = "webkit_dom_html_text_area_element_set_name")]+		public void set_name (string value);+		[CCode (cname = "webkit_dom_html_text_area_element_set_placeholder")]+		public void set_placeholder (string value);+		[CCode (cname = "webkit_dom_html_text_area_element_set_read_only")]+		public void set_read_only (bool value);+		[CCode (cname = "webkit_dom_html_text_area_element_set_required")]+		public void set_required (bool value);+		[CCode (cname = "webkit_dom_html_text_area_element_set_rows")]+		public void set_rows (long value);+		[CCode (cname = "webkit_dom_html_text_area_element_set_selection_direction")]+		public void set_selection_direction (string value);+		[CCode (cname = "webkit_dom_html_text_area_element_set_selection_end")]+		public void set_selection_end (long value);+		[CCode (cname = "webkit_dom_html_text_area_element_set_selection_range")]+		public void set_selection_range (long start, long end, string direction);+		[CCode (cname = "webkit_dom_html_text_area_element_set_selection_start")]+		public void set_selection_start (long value);+		[CCode (cname = "webkit_dom_html_text_area_element_set_value")]+		public void set_value (string value);+		public string access_key { get; set; }+		public bool autofocus { get; set; }+		public long cols { get; set; }+		public string default_value { get; set; }+		public bool disabled { get; set; }+		public WebKit.DOMHTMLFormElement form { get; }+		public WebKit.DOMNodeList labels { get; }+		public long max_length { get; set; }+		public string name { get; set; }+		public string placeholder { get; set; }+		public bool read_only { get; set; }+		public bool required { get; set; }+		public long rows { get; set; }+		public string selection_direction { get; set; }+		public long selection_end { get; set; }+		public long selection_start { get; set; }+		public ulong text_length { get; }+		[NoAccessorMethod]+		public string type { owned get; }+		public string validation_message { get; }+		public WebKit.DOMValidityState validity { get; }+		public string value { get; set; }+		public bool will_validate { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLTitleElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLTitleElement ();+		[CCode (cname = "webkit_dom_html_title_element_get_text")]+		public unowned string get_text ();+		[CCode (cname = "webkit_dom_html_title_element_set_text")]+		public void set_text (string value);+		public string text { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLUListElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLUListElement ();+		[CCode (cname = "webkit_dom_htmlu_list_element_get_compact")]+		public bool get_compact ();+		[CCode (cname = "webkit_dom_htmlu_list_element_set_compact")]+		public void set_compact (bool value);+		public bool compact { get; set; }+		[NoAccessorMethod]+		public string type { owned get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHTMLVideoElement : WebKit.DOMHTMLMediaElement, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMHTMLVideoElement ();+		[CCode (cname = "webkit_dom_html_video_element_get_height")]+		public ulong get_height ();+		[CCode (cname = "webkit_dom_html_video_element_get_poster")]+		public unowned string get_poster ();+		[CCode (cname = "webkit_dom_html_video_element_get_video_height")]+		public ulong get_video_height ();+		[CCode (cname = "webkit_dom_html_video_element_get_video_width")]+		public ulong get_video_width ();+		[CCode (cname = "webkit_dom_html_video_element_get_webkit_decoded_frame_count")]+		public ulong get_webkit_decoded_frame_count ();+		[CCode (cname = "webkit_dom_html_video_element_get_webkit_displaying_fullscreen")]+		public bool get_webkit_displaying_fullscreen ();+		[CCode (cname = "webkit_dom_html_video_element_get_webkit_dropped_frame_count")]+		public ulong get_webkit_dropped_frame_count ();+		[CCode (cname = "webkit_dom_html_video_element_get_webkit_supports_fullscreen")]+		public bool get_webkit_supports_fullscreen ();+		[CCode (cname = "webkit_dom_html_video_element_get_width")]+		public ulong get_width ();+		[CCode (cname = "webkit_dom_html_video_element_set_height")]+		public void set_height (ulong value);+		[CCode (cname = "webkit_dom_html_video_element_set_poster")]+		public void set_poster (string value);+		[CCode (cname = "webkit_dom_html_video_element_set_width")]+		public void set_width (ulong value);+		[CCode (cname = "webkit_dom_html_video_element_webkit_enter_full_screen")]+		public void webkit_enter_full_screen () throws GLib.Error;+		[CCode (cname = "webkit_dom_html_video_element_webkit_enter_fullscreen")]+		public void webkit_enter_fullscreen () throws GLib.Error;+		[CCode (cname = "webkit_dom_html_video_element_webkit_exit_full_screen")]+		public void webkit_exit_full_screen ();+		[CCode (cname = "webkit_dom_html_video_element_webkit_exit_fullscreen")]+		public void webkit_exit_fullscreen ();+		public ulong height { get; set; }+		public string poster { get; set; }+		public ulong video_height { get; }+		public ulong video_width { get; }+		public bool webkit_displaying_fullscreen { get; }+		public bool webkit_supports_fullscreen { get; }+		public ulong width { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMHistory : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMHistory ();+		public void back ();+		public void forward ();+		public ulong get_length ();+		public void go (long distance);+		public ulong length { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMLocation : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMLocation ();+		public unowned string get_origin ();+		public unowned string get_parameter (string name);+		public string origin { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMMediaError : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMMediaError ();+		public ushort get_code ();+		public uint code { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMMediaList : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMMediaList ();+		public void append_medium (string new_medium) throws GLib.Error;+		public void delete_medium (string old_medium) throws GLib.Error;+		public ulong get_length ();+		public unowned string get_media_text ();+		public unowned string item (ulong index);+		public void set_media_text (string value) throws GLib.Error;+		public ulong length { get; }+		public string media_text { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMMediaQueryList : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMMediaQueryList ();+		public bool get_matches ();+		public unowned string get_media ();+		public bool matches { get; }+		public string media { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMMemoryInfo : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMMemoryInfo ();+		public ulong get_js_heap_size_limit ();+		public ulong get_total_js_heap_size ();+		public ulong get_used_js_heap_size ();+		public ulong js_heap_size_limit { get; }+		public ulong total_js_heap_size { get; }+		public ulong used_js_heap_size { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMMessagePort : WebKit.DOMObject, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMMessagePort ();+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMMouseEvent : WebKit.DOMUIEvent {+		[CCode (has_construct_function = false)]+		protected DOMMouseEvent ();+		public bool get_alt_key ();+		public ushort get_button ();+		public long get_client_x ();+		public long get_client_y ();+		public bool get_ctrl_key ();+		public unowned WebKit.DOMNode get_from_element ();+		public bool get_meta_key ();+		public long get_offset_x ();+		public long get_offset_y ();+		public unowned WebKit.DOMEventTarget get_related_target ();+		public long get_screen_x ();+		public long get_screen_y ();+		public bool get_shift_key ();+		public unowned WebKit.DOMNode get_to_element ();+		public long get_x ();+		public long get_y ();+		public void init_mouse_event (string type, bool can_bubble, bool cancelable, WebKit.DOMDOMWindow view, long detail, long screen_x, long screen_y, long client_x, long client_y, bool ctrl_key, bool alt_key, bool shift_key, bool meta_key, ushort button, WebKit.DOMEventTarget related_target);+		public bool alt_key { get; }+		public uint button { get; }+		public long client_x { get; }+		public long client_y { get; }+		public bool ctrl_key { get; }+		public WebKit.DOMNode from_element { get; }+		public bool meta_key { get; }+		public long offset_x { get; }+		public long offset_y { get; }+		public WebKit.DOMEventTarget related_target { get; }+		public long screen_x { get; }+		public long screen_y { get; }+		public bool shift_key { get; }+		public WebKit.DOMNode to_element { get; }+		public long x { get; }+		public long y { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMNamedNodeMap : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMNamedNodeMap ();+		public ulong get_length ();+		public unowned WebKit.DOMNode get_named_item (string name);+		public unowned WebKit.DOMNode get_named_item_ns (string namespace_uri, string local_name);+		public unowned WebKit.DOMNode item (ulong index);+		public unowned WebKit.DOMNode remove_named_item (string name) throws GLib.Error;+		public unowned WebKit.DOMNode remove_named_item_ns (string namespace_uri, string local_name) throws GLib.Error;+		public unowned WebKit.DOMNode set_named_item (WebKit.DOMNode node) throws GLib.Error;+		public unowned WebKit.DOMNode set_named_item_ns (WebKit.DOMNode node) throws GLib.Error;+		public ulong length { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMNavigator : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMNavigator ();+		public unowned string get_app_code_name ();+		public unowned string get_app_name ();+		public unowned string get_app_version ();+		public bool get_cookie_enabled ();+		public unowned WebKit.DOMGeolocation get_geolocation ();+		public unowned string get_language ();+		public unowned WebKit.DOMDOMMimeTypeArray get_mime_types ();+		public bool get_on_line ();+		public unowned string get_platform ();+		public unowned WebKit.DOMDOMPluginArray get_plugins ();+		public unowned string get_product ();+		public unowned string get_product_sub ();+		public void get_storage_updates ();+		public unowned string get_user_agent ();+		public unowned string get_vendor ();+		public unowned string get_vendor_sub ();+		public bool java_enabled ();+		public string app_code_name { get; }+		public string app_name { get; }+		public string app_version { get; }+		public bool cookie_enabled { get; }+		public WebKit.DOMGeolocation geolocation { get; }+		public string language { get; }+		public WebKit.DOMDOMMimeTypeArray mime_types { get; }+		public bool on_line { get; }+		public string platform { get; }+		public WebKit.DOMDOMPluginArray plugins { get; }+		public string product { get; }+		public string product_sub { get; }+		public string user_agent { get; }+		public string vendor { get; }+		public string vendor_sub { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMNode : WebKit.DOMObject, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMNode ();+		public unowned WebKit.DOMNode append_child (WebKit.DOMNode new_child) throws GLib.Error;+		public unowned WebKit.DOMNode clone_node (bool deep);+		public ushort compare_document_position (WebKit.DOMNode other);+		public bool contains (WebKit.DOMNode other);+		public unowned WebKit.DOMNamedNodeMap get_attributes ();+		public unowned string get_base_uri ();+		public unowned WebKit.DOMNodeList get_child_nodes ();+		public unowned WebKit.DOMNode get_first_child ();+		public unowned WebKit.DOMNode get_last_child ();+		public unowned string get_local_name ();+		public unowned string get_namespace_uri ();+		public unowned WebKit.DOMNode get_next_sibling ();+		public unowned string get_node_name ();+		public ushort get_node_type ();+		public unowned string get_node_value ();+		public unowned WebKit.DOMDocument get_owner_document ();+		public unowned WebKit.DOMElement get_parent_element ();+		public unowned WebKit.DOMNode get_parent_node ();+		public unowned string get_prefix ();+		public unowned WebKit.DOMNode get_previous_sibling ();+		public unowned string get_text_content ();+		public bool has_attributes ();+		public bool has_child_nodes ();+		public unowned WebKit.DOMNode insert_before (WebKit.DOMNode new_child, WebKit.DOMNode ref_child) throws GLib.Error;+		public bool is_default_namespace (string namespace_uri);+		public bool is_equal_node (WebKit.DOMNode other);+		public bool is_same_node (WebKit.DOMNode other);+		public bool is_supported (string feature, string version);+		public unowned string lookup_namespace_uri (string prefix);+		public unowned string lookup_prefix (string namespace_uri);+		public void normalize ();+		public unowned WebKit.DOMNode remove_child (WebKit.DOMNode old_child) throws GLib.Error;+		public unowned WebKit.DOMNode replace_child (WebKit.DOMNode new_child, WebKit.DOMNode old_child) throws GLib.Error;+		public void set_node_value (string value) throws GLib.Error;+		public void set_prefix (string value) throws GLib.Error;+		public void set_text_content (string value) throws GLib.Error;+		public WebKit.DOMNamedNodeMap attributes { get; }+		public string base_uri { get; }+		public WebKit.DOMNodeList child_nodes { get; }+		public WebKit.DOMNode first_child { get; }+		public WebKit.DOMNode last_child { get; }+		public string local_name { get; }+		public string namespace_uri { get; }+		public WebKit.DOMNode next_sibling { get; }+		public string node_name { get; }+		public uint node_type { get; }+		public string node_value { get; set; }+		public WebKit.DOMDocument owner_document { get; }+		public WebKit.DOMElement parent_element { get; }+		public WebKit.DOMNode parent_node { get; }+		public string prefix { get; set; }+		public WebKit.DOMNode previous_sibling { get; }+		public string text_content { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMNodeFilter : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMNodeFilter ();+		public short accept_node (WebKit.DOMNode n);+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMNodeIterator : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMNodeIterator ();+		public void detach ();+		public bool get_expand_entity_references ();+		public unowned WebKit.DOMNodeFilter get_filter ();+		public bool get_pointer_before_reference_node ();+		public unowned WebKit.DOMNode get_reference_node ();+		public unowned WebKit.DOMNode get_root ();+		public ulong get_what_to_show ();+		public unowned WebKit.DOMNode next_node () throws GLib.Error;+		public unowned WebKit.DOMNode previous_node () throws GLib.Error;+		public bool expand_entity_references { get; }+		public WebKit.DOMNodeFilter filter { get; }+		public bool pointer_before_reference_node { get; }+		public WebKit.DOMNode reference_node { get; }+		public WebKit.DOMNode root { get; }+		public ulong what_to_show { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMNodeList : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMNodeList ();+		public ulong get_length ();+		public unowned WebKit.DOMNode item (ulong index);+		public ulong length { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMObject : GLib.Object {+		public void* coreObject;+		[CCode (has_construct_function = false)]+		protected DOMObject ();+		public void* core_object { construct; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMProcessingInstruction : WebKit.DOMNode, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMProcessingInstruction ();+		public unowned string get_data ();+		public unowned WebKit.DOMStyleSheet get_sheet ();+		public unowned string get_target ();+		public void set_data (string value) throws GLib.Error;+		public string data { get; set; }+		public WebKit.DOMStyleSheet sheet { get; }+		public string target { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMRange : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMRange ();+		public unowned WebKit.DOMDocumentFragment clone_contents () throws GLib.Error;+		public unowned WebKit.DOMRange clone_range () throws GLib.Error;+		public void collapse (bool to_start) throws GLib.Error;+		public short compare_boundary_points (ushort how, WebKit.DOMRange source_range) throws GLib.Error;+		public short compare_node (WebKit.DOMNode ref_node) throws GLib.Error;+		public short compare_point (WebKit.DOMNode ref_node, long offset) throws GLib.Error;+		public unowned WebKit.DOMDocumentFragment create_contextual_fragment (string html) throws GLib.Error;+		public void delete_contents () throws GLib.Error;+		public void detach () throws GLib.Error;+		public void expand (string unit) throws GLib.Error;+		public unowned WebKit.DOMDocumentFragment extract_contents () throws GLib.Error;+		public bool get_collapsed () throws GLib.Error;+		public unowned WebKit.DOMNode get_common_ancestor_container () throws GLib.Error;+		public unowned WebKit.DOMNode get_end_container () throws GLib.Error;+		public long get_end_offset () throws GLib.Error;+		public unowned WebKit.DOMNode get_start_container () throws GLib.Error;+		public long get_start_offset () throws GLib.Error;+		public unowned string get_text ();+		public void insert_node (WebKit.DOMNode new_node) throws GLib.Error;+		public bool intersects_node (WebKit.DOMNode ref_node) throws GLib.Error;+		public bool is_point_in_range (WebKit.DOMNode ref_node, long offset) throws GLib.Error;+		public void select_node (WebKit.DOMNode ref_node) throws GLib.Error;+		public void select_node_contents (WebKit.DOMNode ref_node) throws GLib.Error;+		public void set_end (WebKit.DOMNode ref_node, long offset) throws GLib.Error;+		public void set_end_after (WebKit.DOMNode ref_node) throws GLib.Error;+		public void set_end_before (WebKit.DOMNode ref_node) throws GLib.Error;+		public void set_start (WebKit.DOMNode ref_node, long offset) throws GLib.Error;+		public void set_start_after (WebKit.DOMNode ref_node) throws GLib.Error;+		public void set_start_before (WebKit.DOMNode ref_node) throws GLib.Error;+		public void surround_contents (WebKit.DOMNode new_parent) throws GLib.Error;+		public unowned string to_string () throws GLib.Error;+		public bool collapsed { get; }+		public WebKit.DOMNode common_ancestor_container { get; }+		public WebKit.DOMNode end_container { get; }+		public long end_offset { get; }+		public WebKit.DOMNode start_container { get; }+		public long start_offset { get; }+		public string text { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMScreen : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMScreen ();+		public ulong get_avail_height ();+		public long get_avail_left ();+		public long get_avail_top ();+		public ulong get_avail_width ();+		public ulong get_color_depth ();+		public ulong get_height ();+		public ulong get_pixel_depth ();+		public ulong get_width ();+		public ulong avail_height { get; }+		public long avail_left { get; }+		public long avail_top { get; }+		public ulong avail_width { get; }+		public ulong color_depth { get; }+		public ulong height { get; }+		public ulong pixel_depth { get; }+		public ulong width { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMStorage : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMStorage ();+		public void clear ();+		public unowned string get_item (string key);+		public ulong get_length ();+		public unowned string key (ulong index);+		public void remove_item (string key);+		public void set_item (string key, string data) throws GLib.Error;+		public ulong length { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMStyleMedia : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMStyleMedia ();+		public bool match_medium (string mediaquery);+		[NoAccessorMethod]+		public string type { owned get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMStyleSheet : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMStyleSheet ();+		public bool get_disabled ();+		public unowned string get_href ();+		public unowned WebKit.DOMMediaList get_media ();+		public unowned WebKit.DOMNode get_owner_node ();+		public unowned WebKit.DOMStyleSheet get_parent_style_sheet ();+		public unowned string get_title ();+		public void set_disabled (bool value);+		public bool disabled { get; set; }+		public string href { get; }+		public WebKit.DOMMediaList media { get; }+		public WebKit.DOMNode owner_node { get; }+		public WebKit.DOMStyleSheet parent_style_sheet { get; }+		public string title { get; }+		[NoAccessorMethod]+		public string type { owned get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMStyleSheetList : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMStyleSheetList ();+		public ulong get_length ();+		public unowned WebKit.DOMStyleSheet item (ulong index);+		public ulong length { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMText : WebKit.DOMCharacterData, WebKit.DOMEventTarget {+		[CCode (has_construct_function = false)]+		protected DOMText ();+		public unowned string get_whole_text ();+		public unowned WebKit.DOMText replace_whole_text (string content) throws GLib.Error;+		public unowned WebKit.DOMText split_text (ulong offset) throws GLib.Error;+		public string whole_text { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMTimeRanges : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMTimeRanges ();+		public float end (ulong index) throws GLib.Error;+		public ulong get_length ();+		public float start (ulong index) throws GLib.Error;+		public ulong length { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMTreeWalker : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMTreeWalker ();+		public unowned WebKit.DOMNode first_child ();+		public unowned WebKit.DOMNode get_current_node ();+		public bool get_expand_entity_references ();+		public unowned WebKit.DOMNodeFilter get_filter ();+		public unowned WebKit.DOMNode get_root ();+		public ulong get_what_to_show ();+		public unowned WebKit.DOMNode last_child ();+		public unowned WebKit.DOMNode next_node ();+		public unowned WebKit.DOMNode next_sibling ();+		public unowned WebKit.DOMNode parent_node ();+		public unowned WebKit.DOMNode previous_node ();+		public unowned WebKit.DOMNode previous_sibling ();+		public void set_current_node (WebKit.DOMNode value) throws GLib.Error;+		public WebKit.DOMNode current_node { get; set; }+		public bool expand_entity_references { get; }+		public WebKit.DOMNodeFilter filter { get; }+		public WebKit.DOMNode root { get; }+		public ulong what_to_show { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMUIEvent : WebKit.DOMEvent {+		[CCode (has_construct_function = false)]+		protected DOMUIEvent ();+		[CCode (cname = "webkit_dom_ui_event_get_char_code")]+		public long get_char_code ();+		[CCode (cname = "webkit_dom_ui_event_get_detail")]+		public long get_detail ();+		[CCode (cname = "webkit_dom_ui_event_get_key_code")]+		public long get_key_code ();+		[CCode (cname = "webkit_dom_ui_event_get_layer_x")]+		public long get_layer_x ();+		[CCode (cname = "webkit_dom_ui_event_get_layer_y")]+		public long get_layer_y ();+		[CCode (cname = "webkit_dom_ui_event_get_page_x")]+		public long get_page_x ();+		[CCode (cname = "webkit_dom_ui_event_get_page_y")]+		public long get_page_y ();+		[CCode (cname = "webkit_dom_ui_event_get_view")]+		public unowned WebKit.DOMDOMWindow get_view ();+		[CCode (cname = "webkit_dom_ui_event_get_which")]+		public long get_which ();+		[CCode (cname = "webkit_dom_ui_event_init_ui_event")]+		public void init_ui_event (string type, bool can_bubble, bool cancelable, WebKit.DOMDOMWindow view, long detail);+		public long char_code { get; }+		public long detail { get; }+		public long key_code { get; }+		public long layer_x { get; }+		public long layer_y { get; }+		public long page_x { get; }+		public long page_y { get; }+		public WebKit.DOMDOMWindow view { get; }+		public long which { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMValidityState : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMValidityState ();+		public bool get_custom_error ();+		public bool get_pattern_mismatch ();+		public bool get_range_overflow ();+		public bool get_range_underflow ();+		public bool get_step_mismatch ();+		public bool get_too_long ();+		public bool get_type_mismatch ();+		public bool get_valid ();+		public bool get_value_missing ();+		public bool custom_error { get; }+		public bool pattern_mismatch { get; }+		public bool range_overflow { get; }+		public bool range_underflow { get; }+		public bool step_mismatch { get; }+		public bool too_long { get; }+		public bool type_mismatch { get; }+		public bool valid { get; }+		public bool value_missing { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMWebKitAnimation : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMWebKitAnimation ();+		[CCode (cname = "webkit_dom_webkit_animation_get_delay")]+		public double get_delay ();+		[CCode (cname = "webkit_dom_webkit_animation_get_direction")]+		public ushort get_direction ();+		[CCode (cname = "webkit_dom_webkit_animation_get_duration")]+		public double get_duration ();+		[CCode (cname = "webkit_dom_webkit_animation_get_elapsed_time")]+		public double get_elapsed_time ();+		[CCode (cname = "webkit_dom_webkit_animation_get_ended")]+		public bool get_ended ();+		[CCode (cname = "webkit_dom_webkit_animation_get_fill_mode")]+		public ushort get_fill_mode ();+		[CCode (cname = "webkit_dom_webkit_animation_get_name")]+		public unowned string get_name ();+		[CCode (cname = "webkit_dom_webkit_animation_get_paused")]+		public bool get_paused ();+		[CCode (cname = "webkit_dom_webkit_animation_pause")]+		public void pause ();+		[CCode (cname = "webkit_dom_webkit_animation_play")]+		public void play ();+		[CCode (cname = "webkit_dom_webkit_animation_set_elapsed_time")]+		public void set_elapsed_time (double value);+		public double delay { get; }+		public uint direction { get; }+		public double duration { get; }+		public double elapsed_time { get; set; }+		public bool ended { get; }+		public uint fill_mode { get; }+		[NoAccessorMethod]+		public int iteration_count { get; }+		public string name { get; }+		public bool paused { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMWebKitAnimationList : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMWebKitAnimationList ();+		[CCode (cname = "webkit_dom_webkit_animation_list_get_length")]+		public ulong get_length ();+		[CCode (cname = "webkit_dom_webkit_animation_list_item")]+		public unowned WebKit.DOMWebKitAnimation item (ulong index);+		public ulong length { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMWebKitPoint : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMWebKitPoint ();+		[CCode (cname = "webkit_dom_webkit_point_get_x")]+		public float get_x ();+		[CCode (cname = "webkit_dom_webkit_point_get_y")]+		public float get_y ();+		[CCode (cname = "webkit_dom_webkit_point_set_x")]+		public void set_x (float value);+		[CCode (cname = "webkit_dom_webkit_point_set_y")]+		public void set_y (float value);+		public float x { get; set; }+		public float y { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMXPathExpression : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMXPathExpression ();+		[CCode (cname = "webkit_dom_xpath_expression_evaluate")]+		public unowned WebKit.DOMXPathResult evaluate (WebKit.DOMNode context_node, ushort type, WebKit.DOMXPathResult in_result) throws GLib.Error;+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMXPathNSResolver : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMXPathNSResolver ();+		[CCode (cname = "webkit_dom_xpath_ns_resolver_lookup_namespace_uri")]+		public unowned string lookup_namespace_uri (string prefix);+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class DOMXPathResult : WebKit.DOMObject {+		[CCode (has_construct_function = false)]+		protected DOMXPathResult ();+		[CCode (cname = "webkit_dom_xpath_result_get_boolean_value")]+		public bool get_boolean_value () throws GLib.Error;+		[CCode (cname = "webkit_dom_xpath_result_get_invalid_iterator_state")]+		public bool get_invalid_iterator_state ();+		[CCode (cname = "webkit_dom_xpath_result_get_number_value")]+		public double get_number_value () throws GLib.Error;+		[CCode (cname = "webkit_dom_xpath_result_get_result_type")]+		public ushort get_result_type ();+		[CCode (cname = "webkit_dom_xpath_result_get_single_node_value")]+		public unowned WebKit.DOMNode get_single_node_value () throws GLib.Error;+		[CCode (cname = "webkit_dom_xpath_result_get_snapshot_length")]+		public ulong get_snapshot_length () throws GLib.Error;+		[CCode (cname = "webkit_dom_xpath_result_get_string_value")]+		public unowned string get_string_value () throws GLib.Error;+		[CCode (cname = "webkit_dom_xpath_result_iterate_next")]+		public unowned WebKit.DOMNode iterate_next () throws GLib.Error;+		[CCode (cname = "webkit_dom_xpath_result_snapshot_item")]+		public unowned WebKit.DOMNode snapshot_item (ulong index) throws GLib.Error;+		public bool boolean_value { get; }+		public bool invalid_iterator_state { get; }+		public double number_value { get; }+		public uint result_type { get; }+		public WebKit.DOMNode single_node_value { get; }+		public ulong snapshot_length { get; }+		public string string_value { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class Download : GLib.Object {+		[CCode (has_construct_function = false)]+		public Download (WebKit.NetworkRequest request);+		public void cancel ();+		public uint64 get_current_size ();+		public unowned string get_destination_uri ();+		public double get_elapsed_time ();+		public unowned WebKit.NetworkRequest get_network_request ();+		public unowned WebKit.NetworkResponse get_network_response ();+		public double get_progress ();+		public WebKit.DownloadStatus get_status ();+		public unowned string get_suggested_filename ();+		public uint64 get_total_size ();+		public unowned string get_uri ();+		public void set_destination_uri (string destination_uri);+		public void start ();+		public uint64 current_size { get; }+		public string destination_uri { get; set; }+		public WebKit.NetworkRequest network_request { get; construct; }+		public WebKit.NetworkResponse network_response { get; construct; }+		public double progress { get; }+		public WebKit.DownloadStatus status { get; }+		public string suggested_filename { get; }+		public uint64 total_size { get; }+		public virtual signal bool error (int p0, int p1, string p2);+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class GeolocationPolicyDecision : GLib.Object {+		[CCode (has_construct_function = false)]+		protected GeolocationPolicyDecision ();+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class HitTestResult : GLib.Object {+		[CCode (has_construct_function = false)]+		protected HitTestResult ();+		[NoAccessorMethod]+		public WebKit.HitTestResultContext context { get; construct; }+		[NoAccessorMethod]+		public string image_uri { owned get; construct; }+		[NoAccessorMethod]+		public WebKit.DOMNode inner_node { owned get; construct; }+		[NoAccessorMethod]+		public string link_uri { owned get; construct; }+		[NoAccessorMethod]+		public string media_uri { owned get; construct; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class IconDatabase : GLib.Object {+		[CCode (has_construct_function = false)]+		protected IconDatabase ();+		public void clear ();+		public unowned Gdk.Pixbuf get_icon_pixbuf (string page_uri);+		public unowned string get_icon_uri (string page_uri);+		public unowned string get_path ();+		public void set_path (string path);+		public string path { get; set; }+		public virtual signal void icon_loaded (WebKit.WebFrame p0, string p1);+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class NetworkRequest : GLib.Object {+		[CCode (has_construct_function = false)]+		public NetworkRequest (string uri);+		public unowned Soup.Message get_message ();+		public unowned string get_uri ();+		public void set_uri (string uri);+		public Soup.Message message { get; construct; }+		public string uri { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class NetworkResponse : GLib.Object {+		[CCode (has_construct_function = false)]+		public NetworkResponse (string uri);+		public unowned Soup.Message get_message ();+		public unowned string get_uri ();+		public void set_uri (string uri);+		public Soup.Message message { get; construct; }+		public string uri { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class SecurityOrigin : GLib.Object {+		[CCode (has_construct_function = false)]+		protected SecurityOrigin ();+		public unowned GLib.List<WebKit.WebDatabase> get_all_web_databases ();+		public unowned string get_host ();+		public uint get_port ();+		public unowned string get_protocol ();+		public uint64 get_web_database_quota ();+		public uint64 get_web_database_usage ();+		public void set_web_database_quota (uint64 quota);+		public string host { get; }+		public uint port { get; }+		public string protocol { get; }+		public uint64 web_database_quota { get; set; }+		public uint64 web_database_usage { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class SoupAuthDialog : GLib.Object, Soup.SessionFeature {+		[CCode (has_construct_function = false)]+		protected SoupAuthDialog ();+		public virtual signal unowned Gtk.Widget current_toplevel (Soup.Message message);+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class ViewportAttributes : GLib.Object {+		[CCode (has_construct_function = false)]+		protected ViewportAttributes ();+		public void recompute ();+		[NoAccessorMethod]+		public int available_height { get; set; }+		[NoAccessorMethod]+		public int available_width { get; set; }+		[NoAccessorMethod]+		public int desktop_width { get; set; }+		[NoAccessorMethod]+		public int device_dpi { get; set; }+		[NoAccessorMethod]+		public int device_height { get; set; }+		[NoAccessorMethod]+		public float device_pixel_ratio { get; }+		[NoAccessorMethod]+		public int device_width { get; set; }+		[NoAccessorMethod]+		public int height { get; }+		[NoAccessorMethod]+		public float initial_scale_factor { get; }+		[NoAccessorMethod]+		public float maximum_scale_factor { get; }+		[NoAccessorMethod]+		public float minimum_scale_factor { get; }+		[NoAccessorMethod]+		public bool user_scalable { get; }+		[NoAccessorMethod]+		public bool valid { get; }+		[NoAccessorMethod]+		public int width { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class WebBackForwardList : GLib.Object {+		[CCode (has_construct_function = false)]+		protected WebBackForwardList ();+		public void add_item (WebKit.WebHistoryItem history_item);+		public void clear ();+		public bool contains_item (WebKit.WebHistoryItem history_item);+		public unowned WebKit.WebHistoryItem get_back_item ();+		public int get_back_length ();+		public unowned GLib.List<WebKit.WebHistoryItem> get_back_list_with_limit (int limit);+		public unowned WebKit.WebHistoryItem get_current_item ();+		public unowned WebKit.WebHistoryItem get_forward_item ();+		public int get_forward_length ();+		public unowned GLib.List<WebKit.WebHistoryItem> get_forward_list_with_limit (int limit);+		public int get_limit ();+		public unowned WebKit.WebHistoryItem get_nth_item (int index);+		public void go_back ();+		public void go_forward ();+		public void go_to_item (WebKit.WebHistoryItem history_item);+		public void set_limit (int limit);+		[CCode (has_construct_function = false)]+		public WebBackForwardList.with_web_view (WebKit.WebView web_view);+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class WebDataSource : GLib.Object {+		[CCode (has_construct_function = false)]+		public WebDataSource ();+		public unowned GLib.StringBuilder get_data ();+		public unowned string get_encoding ();+		public unowned WebKit.NetworkRequest get_initial_request ();+		public unowned WebKit.WebResource get_main_resource ();+		public unowned WebKit.NetworkRequest get_request ();+		public unowned GLib.List<WebKit.WebResource> get_subresources ();+		public unowned string get_unreachable_uri ();+		public unowned WebKit.WebFrame get_web_frame ();+		public bool is_loading ();+		[CCode (has_construct_function = false)]+		public WebDataSource.with_request (WebKit.NetworkRequest request);+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class WebDatabase : GLib.Object {+		[CCode (has_construct_function = false)]+		protected WebDatabase ();+		public unowned string get_display_name ();+		public uint64 get_expected_size ();+		public unowned string get_filename ();+		public unowned string get_name ();+		public unowned WebKit.SecurityOrigin get_security_origin ();+		public uint64 get_size ();+		public void remove ();+		public string display_name { get; }+		public uint64 expected_size { get; }+		public string filename { get; }+		public string name { get; construct; }+		public WebKit.SecurityOrigin security_origin { get; construct; }+		public uint64 size { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class WebFrame : GLib.Object {+		[CCode (has_construct_function = false)]+		public WebFrame (WebKit.WebView web_view);+		public unowned WebKit.WebFrame find_frame (string name);+		public unowned WebKit.WebDataSource get_data_source ();+		public Gtk.PolicyType get_horizontal_scrollbar_policy ();+		public WebKit.LoadStatus get_load_status ();+		public unowned string get_name ();+		public unowned WebKit.NetworkResponse get_network_response ();+		public unowned WebKit.WebFrame get_parent ();+		public unowned WebKit.WebDataSource get_provisional_data_source ();+		public unowned WebKit.DOMRange get_range_for_word_around_caret ();+		public unowned WebKit.SecurityOrigin get_security_origin ();+		public unowned string get_title ();+		public unowned string get_uri ();+		public Gtk.PolicyType get_vertical_scrollbar_policy ();+		public unowned WebKit.WebView get_web_view ();+		public void load_alternate_string (string content, string base_url, string unreachable_url);+		public void load_request (WebKit.NetworkRequest request);+		public void load_string (string content, string mime_type, string encoding, string base_uri);+		public void load_uri (string uri);+		public void print ();+		public Gtk.PrintOperationResult print_full (Gtk.PrintOperation operation, Gtk.PrintOperationAction action) throws GLib.Error;+		public void reload ();+		public void replace_selection (string text);+		public void stop_loading ();+		public Gtk.PolicyType horizontal_scrollbar_policy { get; }+		public WebKit.LoadStatus load_status { get; }+		public string name { get; }+		public string title { get; }+		public string uri { get; }+		public Gtk.PolicyType vertical_scrollbar_policy { get; }+		public virtual signal void cleared ();+		public virtual signal void hovering_over_link (string p0, string p1);+		public virtual signal void load_committed ();+		public virtual signal void load_done (bool p0);+		public virtual signal bool scrollbars_policy_changed ();+		public virtual signal void title_changed (string p0);+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class WebHistoryItem : GLib.Object {+		[CCode (has_construct_function = false)]+		public WebHistoryItem ();+		public unowned WebKit.WebHistoryItem copy ();+		public unowned string get_alternate_title ();+		public double get_last_visited_time ();+		public unowned string get_original_uri ();+		public unowned string get_title ();+		public unowned string get_uri ();+		public void set_alternate_title (string title);+		[CCode (has_construct_function = false)]+		public WebHistoryItem.with_data (string uri, string title);+		public string alternate_title { get; set; }+		public double last_visited_time { get; }+		public string original_uri { get; }+		public string title { get; }+		public string uri { get; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class WebInspector : GLib.Object {+		[CCode (has_construct_function = false)]+		protected WebInspector ();+		public void close ();+		public unowned string get_inspected_uri ();+		public unowned WebKit.WebView get_web_view ();+		public void inspect_coordinates (double x, double y);+		public void inspect_node (WebKit.DOMNode node);+		public void show ();+		public string inspected_uri { get; }+		[NoAccessorMethod]+		public bool javascript_profiling_enabled { get; set; }+		[NoAccessorMethod]+		public bool timeline_profiling_enabled { get; set; }+		public WebKit.WebView web_view { get; }+		public virtual signal bool attach_window ();+		public virtual signal bool close_window ();+		public virtual signal bool detach_window ();+		public virtual signal void finished ();+		public virtual signal unowned WebKit.WebView inspect_web_view (WebKit.WebView p0);+		public virtual signal bool show_window ();+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class WebNavigationAction : GLib.Object {+		[CCode (has_construct_function = false)]+		protected WebNavigationAction ();+		public int get_button ();+		public int get_modifier_state ();+		public unowned string get_original_uri ();+		public WebKit.WebNavigationReason get_reason ();+		public unowned string get_target_frame ();+		public void set_original_uri (string originalUri);+		public void set_reason (WebKit.WebNavigationReason reason);+		public int button { get; construct; }+		public int modifier_state { get; construct; }+		public string original_uri { get; set construct; }+		public WebKit.WebNavigationReason reason { get; set construct; }+		public string target_frame { get; construct; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class WebPlugin : GLib.Object {+		[CCode (has_construct_function = false)]+		protected WebPlugin ();+		public unowned string get_description ();+		public bool get_enabled ();+		public unowned GLib.SList get_mimetypes ();+		public unowned string get_name ();+		public unowned string get_path ();+		public void set_enabled (bool p2);+		public bool enabled { get; set; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class WebPluginDatabase : GLib.Object {+		[CCode (has_construct_function = false)]+		protected WebPluginDatabase ();+		public unowned WebKit.WebPlugin get_plugin_for_mimetype (string p2);+		public unowned GLib.SList get_plugins ();+		public static void plugins_list_free (GLib.SList p1);+		public void refresh ();+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	[Compact]+	public class WebPluginMIMEType {+		public weak string description;+		public weak string extensions;+		public weak string name;+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class WebPolicyDecision : GLib.Object {+		[CCode (has_construct_function = false)]+		protected WebPolicyDecision ();+		public void download ();+		public void ignore ();+		public void use ();+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class WebResource : GLib.Object {+		[CCode (has_construct_function = false)]+		public WebResource (string data, ssize_t size, string uri, string mime_type, string encoding, string frame_name);+		public unowned GLib.StringBuilder get_data ();+		public unowned string get_encoding ();+		public unowned string get_frame_name ();+		public unowned string get_mime_type ();+		public unowned string get_uri ();+		public string encoding { get; }+		public string frame_name { get; }+		public string mime_type { get; }+		public string uri { get; construct; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class WebSettings : GLib.Object {+		[CCode (has_construct_function = false)]+		public WebSettings ();+		public WebKit.WebSettings copy ();+		public unowned string get_user_agent ();+		[NoAccessorMethod]+		public bool auto_load_images { get; set construct; }+		[NoAccessorMethod]+		public bool auto_resize_window { get; set construct; }+		[NoAccessorMethod]+		public bool auto_shrink_images { get; set construct; }+		[NoAccessorMethod]+		public string cursive_font_family { owned get; set construct; }+		[NoAccessorMethod]+		public string default_encoding { owned get; set construct; }+		[NoAccessorMethod]+		public string default_font_family { owned get; set construct; }+		[NoAccessorMethod]+		public int default_font_size { get; set construct; }+		[NoAccessorMethod]+		public int default_monospace_font_size { get; set construct; }+		[NoAccessorMethod]+		public WebKit.EditingBehavior editing_behavior { get; set construct; }+		[NoAccessorMethod]+		public bool enable_caret_browsing { get; set construct; }+		[NoAccessorMethod]+		public bool enable_default_context_menu { get; set construct; }+		[NoAccessorMethod]+		public bool enable_developer_extras { get; set construct; }+		[NoAccessorMethod]+		public bool enable_dns_prefetching { get; set construct; }+		[NoAccessorMethod]+		public bool enable_dom_paste { get; set construct; }+		[NoAccessorMethod]+		public bool enable_file_access_from_file_uris { get; set construct; }+		[NoAccessorMethod]+		public bool enable_frame_flattening { get; set construct; }+		[NoAccessorMethod]+		public bool enable_fullscreen { get; set construct; }+		[NoAccessorMethod]+		public bool enable_html5_database { get; set construct; }+		[NoAccessorMethod]+		public bool enable_html5_local_storage { get; set construct; }+		[NoAccessorMethod]+		public bool enable_hyperlink_auditing { get; set construct; }+		[NoAccessorMethod]+		public bool enable_java_applet { get; set construct; }+		[NoAccessorMethod]+		public bool enable_offline_web_application_cache { get; set construct; }+		[NoAccessorMethod]+		public bool enable_page_cache { get; set construct; }+		[NoAccessorMethod]+		public bool enable_plugins { get; set construct; }+		[NoAccessorMethod]+		public bool enable_private_browsing { get; set construct; }+		[NoAccessorMethod]+		public bool enable_scripts { get; set construct; }+		[NoAccessorMethod]+		public bool enable_site_specific_quirks { get; set construct; }+		[NoAccessorMethod]+		public bool enable_spatial_navigation { get; set construct; }+		[NoAccessorMethod]+		public bool enable_spell_checking { get; set construct; }+		[NoAccessorMethod]+		public bool enable_universal_access_from_file_uris { get; set construct; }+		[NoAccessorMethod]+		public bool enable_webgl { get; set construct; }+		[NoAccessorMethod]+		public bool enable_xss_auditor { get; set construct; }+		[NoAccessorMethod]+		public bool enforce_96_dpi { get; set construct; }+		[NoAccessorMethod]+		public string fantasy_font_family { owned get; set construct; }+		[NoAccessorMethod]+		public string html5_local_storage_database_path { owned get; set construct; }+		[NoAccessorMethod]+		public bool javascript_can_access_clipboard { get; set construct; }+		[NoAccessorMethod]+		public bool javascript_can_open_windows_automatically { get; set construct; }+		[NoAccessorMethod]+		public int minimum_font_size { get; set construct; }+		[NoAccessorMethod]+		public int minimum_logical_font_size { get; set construct; }+		[NoAccessorMethod]+		public string monospace_font_family { owned get; set construct; }+		[NoAccessorMethod]+		public bool print_backgrounds { get; set construct; }+		[NoAccessorMethod]+		public bool resizable_text_areas { get; set construct; }+		[NoAccessorMethod]+		public string sans_serif_font_family { owned get; set construct; }+		[NoAccessorMethod]+		public string serif_font_family { owned get; set construct; }+		[NoAccessorMethod]+		public string spell_checking_languages { owned get; set construct; }+		[NoAccessorMethod]+		public bool tab_key_cycles_through_elements { get; set construct; }+		[NoAccessorMethod]+		public string user_agent { owned get; set construct; }+		[NoAccessorMethod]+		public string user_stylesheet_uri { owned get; set construct; }+		[NoAccessorMethod]+		public float zoom_step { get; set construct; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class WebView : Gtk.Container, Atk.Implementor, Gtk.Buildable {+		[CCode (has_construct_function = false, type = "GtkWidget*")]+		public WebView ();+		public bool can_copy_clipboard ();+		public bool can_cut_clipboard ();+		public bool can_go_back ();+		public bool can_go_back_or_forward (int steps);+		public bool can_go_forward ();+		public bool can_paste_clipboard ();+		public bool can_redo ();+		public bool can_show_mime_type (string mime_type);+		public bool can_undo ();+		[NoWrapper]+		public virtual unowned string choose_file (WebKit.WebFrame frame, string old_file);+		public void delete_selection ();+		public void execute_script (string script);+		public unowned WebKit.WebBackForwardList get_back_forward_list ();+		public unowned Gtk.TargetList get_copy_target_list ();+		public unowned string get_custom_encoding ();+		public unowned WebKit.DOMDocument get_dom_document ();+		public bool get_editable ();+		public unowned string get_encoding ();+		public unowned WebKit.WebFrame get_focused_frame ();+		public bool get_full_content_zoom ();+		public unowned WebKit.HitTestResult get_hit_test_result (Gdk.EventButton event);+		public unowned Gdk.Pixbuf get_icon_pixbuf ();+		public unowned string get_icon_uri ();+		public unowned WebKit.WebInspector get_inspector ();+		public WebKit.LoadStatus get_load_status ();+		public unowned WebKit.WebFrame get_main_frame ();+		public unowned Gtk.TargetList get_paste_target_list ();+		public double get_progress ();+		public unowned WebKit.WebSettings get_settings ();+		public unowned string get_title ();+		public bool get_transparent ();+		public unowned string get_uri ();+		public WebKit.WebViewViewMode get_view_mode ();+		public bool get_view_source_mode ();+		public unowned WebKit.ViewportAttributes get_viewport_attributes ();+		public unowned WebKit.WebWindowFeatures get_window_features ();+		public float get_zoom_level ();+		public void go_back ();+		public void go_back_or_forward (int steps);+		public void go_forward ();+		public bool go_to_back_forward_item (WebKit.WebHistoryItem item);+		public bool has_selection ();+		public void load_html (string content, string base_uri);+		public void load_request (WebKit.NetworkRequest request);+		public void load_string (string content, string mime_type, string encoding, string base_uri);+		public void load_uri (string uri);+		public uint mark_text_matches (string str, bool case_sensitive, uint limit);+		public void open (string uri);+		public void reload ();+		public void reload_bypass_cache ();+		public bool search_text (string text, bool case_sensitive, bool forward, bool wrap);+		public void set_custom_encoding (string encoding);+		public void set_editable (bool flag);+		public void set_full_content_zoom (bool full_content_zoom);+		public void set_highlight_text_matches (bool highlight);+		public void set_maintains_back_forward_list (bool flag);+		public void set_settings (WebKit.WebSettings settings);+		public void set_transparent (bool flag);+		public void set_view_mode (WebKit.WebViewViewMode mode);+		public void set_view_source_mode (bool view_source_mode);+		public void set_zoom_level (float zoom_level);+		[NoWrapper]+		public virtual bool should_allow_editing_action ();+		public void stop_loading ();+		public void unmark_text_matches ();+		public void zoom_in ();+		public void zoom_out ();+		public Gtk.TargetList copy_target_list { get; }+		public string custom_encoding { get; set; }+		public bool editable { get; set; }+		public string encoding { get; }+		public bool full_content_zoom { get; set; }+		public string icon_uri { get; }+		[NoAccessorMethod]+		public Gtk.IMContext im_context { owned get; }+		public WebKit.LoadStatus load_status { get; }+		public Gtk.TargetList paste_target_list { get; }+		public double progress { get; }+		[NoAccessorMethod]+		public bool self_scrolling { get; construct; }+		public WebKit.WebSettings settings { get; set; }+		public string title { get; }+		public bool transparent { get; set; }+		public string uri { get; }+		public WebKit.WebViewViewMode view_mode { get; set; }+		public WebKit.ViewportAttributes viewport_attributes { get; }+		[NoAccessorMethod]+		public WebKit.WebInspector web_inspector { owned get; }+		[NoAccessorMethod]+		public WebKit.WebWindowFeatures window_features { owned get; set; }+		public float zoom_level { get; set; }+		public virtual signal bool close_web_view ();+		public virtual signal bool console_message (string message, int line_number, string source_id);+		[HasEmitter]+		public virtual signal void copy_clipboard ();+		public virtual signal unowned Gtk.Widget create_plugin_widget (string p0, string p1, GLib.HashTable p2);+		public virtual signal WebKit.WebView create_web_view (WebKit.WebFrame web_frame);+		[HasEmitter]+		public virtual signal void cut_clipboard ();+		public virtual signal void database_quota_exceeded (GLib.Object p0, GLib.Object p1);+		public virtual signal void document_load_finished (WebKit.WebFrame p0);+		public virtual signal bool download_requested (GLib.Object p0);+		public virtual signal void editing_began ();+		public virtual signal void editing_ended ();+		public virtual signal void frame_created (WebKit.WebFrame p0);+		public virtual signal void geolocation_policy_decision_cancelled (WebKit.WebFrame p0);+		public virtual signal bool geolocation_policy_decision_requested (WebKit.WebFrame p0, WebKit.GeolocationPolicyDecision p1);+		public virtual signal void hovering_over_link (string? p0, string? p1);+		public virtual signal void icon_loaded (string p0);+		public virtual signal void load_committed (WebKit.WebFrame p0);+		public virtual signal bool load_error (WebKit.WebFrame p0, string p1, GLib.Error p2);+		public virtual signal void load_finished (WebKit.WebFrame p0);+		public virtual signal void load_progress_changed (int p0);+		public virtual signal void load_started (WebKit.WebFrame p0);+		public virtual signal bool mime_type_policy_decision_requested (WebKit.WebFrame p0, WebKit.NetworkRequest p1, string p2, WebKit.WebPolicyDecision p3);+		[HasEmitter]+		public virtual signal bool move_cursor (Gtk.MovementStep step, int count);+		public virtual signal bool navigation_policy_decision_requested (WebKit.WebFrame p0, WebKit.NetworkRequest p1, WebKit.WebNavigationAction p2, WebKit.WebPolicyDecision p3);+		public virtual signal WebKit.NavigationResponse navigation_requested (WebKit.WebFrame frame, WebKit.NetworkRequest request);+		public virtual signal bool new_window_policy_decision_requested (WebKit.WebFrame p0, WebKit.NetworkRequest p1, WebKit.WebNavigationAction p2, WebKit.WebPolicyDecision p3);+		public virtual signal void onload_event (WebKit.WebFrame p0);+		[HasEmitter]+		public virtual signal void paste_clipboard ();+		public virtual signal void populate_popup (Gtk.Menu p0);+		public virtual signal bool print_requested (WebKit.WebFrame p0);+		[HasEmitter]+		public virtual signal void redo ();+		public virtual signal void resource_request_starting (WebKit.WebFrame p0, WebKit.WebResource p1, WebKit.NetworkRequest p2, WebKit.NetworkResponse p3);+		public virtual signal bool script_alert (WebKit.WebFrame frame, string alert_message);+		public virtual signal bool script_confirm (WebKit.WebFrame frame, string confirm_message, void* did_confirm);+		public virtual signal bool script_prompt (WebKit.WebFrame frame, string message, string default_value, void* value);+		[HasEmitter]+		public virtual signal void select_all ();+		public virtual signal void selection_changed ();+		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);+		public virtual signal bool should_apply_style (WebKit.DOMCSSStyleDeclaration p0, WebKit.DOMRange p1);+		public virtual signal bool should_begin_editing (WebKit.DOMRange p0);+		public virtual signal bool should_change_selected_range (WebKit.DOMRange p0, WebKit.DOMRange p1, WebKit.SelectionAffinity p2, bool p3);+		public virtual signal bool should_delete_range (WebKit.DOMRange p0);+		public virtual signal bool should_end_editing (WebKit.DOMRange p0);+		public virtual signal bool should_insert_node (WebKit.DOMNode p0, WebKit.DOMRange p1, WebKit.InsertAction p2);+		public virtual signal bool should_insert_text (string p0, WebKit.DOMRange p1, WebKit.InsertAction p2);+		public virtual signal bool should_show_delete_interface_for_element (WebKit.DOMHTMLElement p0);+		public virtual signal void status_bar_text_changed (string p0);+		public virtual signal void title_changed (WebKit.WebFrame p0, string p1);+		[HasEmitter]+		public virtual signal void undo ();+		public virtual signal void user_changed_contents ();+		public virtual signal void viewport_attributes_changed (WebKit.ViewportAttributes p0);+		public virtual signal void viewport_attributes_recompute_requested (WebKit.ViewportAttributes p0);+		public virtual signal bool web_view_ready ();+		public virtual signal void window_object_cleared (WebKit.WebFrame frame, void* context, void* window_object);+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public class WebWindowFeatures : GLib.Object {+		[CCode (has_construct_function = false)]+		public WebWindowFeatures ();+		public bool equal (WebKit.WebWindowFeatures features2);+		[NoAccessorMethod]+		public bool fullscreen { get; set construct; }+		[NoAccessorMethod]+		public int height { get; set construct; }+		[NoAccessorMethod]+		public bool locationbar_visible { get; set construct; }+		[NoAccessorMethod]+		public bool menubar_visible { get; set construct; }+		[NoAccessorMethod]+		public bool scrollbar_visible { get; set construct; }+		[NoAccessorMethod]+		public bool statusbar_visible { get; set construct; }+		[NoAccessorMethod]+		public bool toolbar_visible { get; set construct; }+		[NoAccessorMethod]+		public int width { get; set construct; }+		[NoAccessorMethod]+		public int x { get; set construct; }+		[NoAccessorMethod]+		public int y { get; set construct; }+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public interface DOMEventTarget : GLib.Object {+		public abstract bool add_event_listener (string eventName, GLib.Callback handler, bool bubble, void* userData);+		public abstract void dispatch_event (WebKit.DOMEvent event) throws GLib.Error;+		public abstract bool remove_event_listener (string eventName, GLib.Callback handler, bool bubble);+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public interface SpellChecker : GLib.Object {+		public abstract void check_spelling_of_string (string str, int misspelling_location, int misspelling_length);+		public abstract unowned string get_autocorrect_suggestions_for_misspelled_word (string word);+		public abstract unowned string get_guesses_for_word (string word, string context);+		public abstract void ignore_word (string word);+		public abstract void learn_word (string word);+		public abstract void update_spell_checking_languages (string languages);+	}+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_CACHE_MODEL_")]+	public enum CacheModel {+		DEFAULT,+		DOCUMENT_VIEWER,+		WEB_BROWSER,+		DOCUMENT_BROWSER+	}+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_DOWNLOAD_ERROR_")]+	public enum DownloadError {+		CANCELLED_BY_USER,+		DESTINATION,+		NETWORK+	}+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_DOWNLOAD_STATUS_")]+	public enum DownloadStatus {+		ERROR,+		CREATED,+		STARTED,+		CANCELLED,+		FINISHED+	}+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_EDITING_BEHAVIOR_")]+	public enum EditingBehavior {+		MAC,+		WINDOWS,+		UNIX+	}+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_HIT_TEST_RESULT_CONTEXT_")]+	[Flags]+	public enum HitTestResultContext {+		DOCUMENT,+		LINK,+		IMAGE,+		MEDIA,+		SELECTION,+		EDITABLE+	}+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_INSERT_ACTION_")]+	public enum InsertAction {+		TYPED,+		PASTED,+		DROPPED+	}+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_LOAD_")]+	public enum LoadStatus {+		PROVISIONAL,+		COMMITTED,+		FINISHED,+		FIRST_VISUALLY_NON_EMPTY_LAYOUT,+		FAILED+	}+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_NAVIGATION_RESPONSE_")]+	public enum NavigationResponse {+		ACCEPT,+		IGNORE,+		DOWNLOAD+	}+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_NETWORK_ERROR_")]+	public enum NetworkError {+		FAILED,+		TRANSPORT,+		UNKNOWN_PROTOCOL,+		CANCELLED,+		FILE_DOES_NOT_EXIST+	}+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_PLUGIN_ERROR_")]+	public enum PluginError {+		FAILED,+		CANNOT_FIND_PLUGIN,+		CANNOT_LOAD_PLUGIN,+		JAVA_UNAVAILABLE,+		CONNECTION_CANCELLED,+		WILL_HANDLE_LOAD+	}+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_POLICY_ERROR_")]+	public enum PolicyError {+		FAILED,+		CANNOT_SHOW_MIME_TYPE,+		CANNOT_SHOW_URL,+		FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE,+		CANNOT_USE_RESTRICTED_PORT+	}+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_SELECTION_AFFINITY_")]+	public enum SelectionAffinity {+		UPSTREAM,+		DOWNSTREAM+	}+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_WEB_NAVIGATION_REASON_")]+	public enum WebNavigationReason {+		LINK_CLICKED,+		FORM_SUBMITTED,+		BACK_FORWARD,+		RELOAD,+		FORM_RESUBMITTED,+		OTHER+	}+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_WEB_VIEW_TARGET_INFO_")]+	public enum WebViewTargetInfo {+		HTML,+		TEXT,+		IMAGE,+		URI_LIST,+		NETSCAPE_URL+	}+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_WEB_VIEW_VIEW_MODE_")]+	public enum WebViewViewMode {+		WINDOWED,+		FLOATING,+		FULLSCREEN,+		MAXIMIZED,+		MINIMIZED+	}+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public const int MAJOR_VERSION;+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public const int MICRO_VERSION;+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public const int MINOR_VERSION;+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public const int USER_AGENT_MAJOR_VERSION;+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public const int USER_AGENT_MINOR_VERSION;+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static unowned string application_cache_get_database_directory_path ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static uint application_cache_get_maximum_size ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static void application_cache_set_maximum_size (uint size);+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static bool check_version (uint major, uint minor, uint micro);+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static void geolocation_policy_allow (WebKit.GeolocationPolicyDecision decision);+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static void geolocation_policy_deny (WebKit.GeolocationPolicyDecision decision);+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static WebKit.CacheModel get_cache_model ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static unowned Soup.Session get_default_session ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static uint64 get_default_web_database_quota ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static unowned WebKit.IconDatabase get_icon_database ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static unowned GLib.Object get_text_checker ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static unowned string get_web_database_directory_path ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static unowned WebKit.WebPluginDatabase get_web_plugin_database ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static uint major_version ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static uint micro_version ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static uint minor_version ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static GLib.Quark network_error_quark ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static GLib.Quark plugin_error_quark ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static GLib.Quark policy_error_quark ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static void remove_all_web_databases ();+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static void set_cache_model (WebKit.CacheModel cache_model);+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static void set_default_web_database_quota (uint64 defaultQuota);+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static void set_text_checker (GLib.Object checker);+	[CCode (cheader_filename = "webkit2/webkit2.h")]+	public static void set_web_database_directory_path (string path);+}diff --git a/webkitgtk-3.0.deps b/webkitgtk-3.0.depsdeleted file mode 100644index 91b1dfe..0000000--- a/webkitgtk-3.0.deps+++ /dev/null@@ -1,8 +0,0 @@-atk-gio-2.0-cairo-pango-gdk-pixbuf-2.0-gdk-3.0-gtk+-3.0-libsoup-2.4diff --git a/webkitgtk-3.0.vapi b/webkitgtk-3.0.vapideleted file mode 100644index 01954c3..0000000--- a/webkitgtk-3.0.vapi+++ /dev/null@@ -1,4817 +0,0 @@-/* webkit-1.0.vapi generated by vapigen, do not modify. */--[CCode (lower_case_cprefix = "webkit_")]-namespace WebKit {-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMAttr : WebKit.DOMNode, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMAttr ();-		public bool get_is_id ();-		public unowned string get_name ();-		public unowned WebKit.DOMElement get_owner_element ();-		public bool get_specified ();-		public unowned string get_value ();-		public void set_value (string value) throws GLib.Error;-		public bool is_id { get; }-		public string name { get; }-		public WebKit.DOMElement owner_element { get; }-		public bool specified { get; }-		public string value { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMBarInfo : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMBarInfo ();-		public bool get_visible ();-		public bool visible { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMBlob : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMBlob ();-		public uint64 get_size ();-		public unowned WebKit.DOMBlob slice (int64 start, int64 end, string content_type);-		public unowned WebKit.DOMBlob webkit_slice (int64 start, int64 end, string content_type);-		public uint64 size { get; }-		[NoAccessorMethod]-		public string type { owned get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMCDATASection : WebKit.DOMText, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMCDATASection ();-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMCSSRule : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMCSSRule ();-		[CCode (cname = "webkit_dom_css_rule_get_css_text")]-		public unowned string get_css_text ();-		[CCode (cname = "webkit_dom_css_rule_get_parent_rule")]-		public unowned WebKit.DOMCSSRule get_parent_rule ();-		[CCode (cname = "webkit_dom_css_rule_get_parent_style_sheet")]-		public unowned WebKit.DOMCSSStyleSheet get_parent_style_sheet ();-		[CCode (cname = "webkit_dom_css_rule_set_css_text")]-		public void set_css_text (string value) throws GLib.Error;-		public string css_text { get; set; }-		public WebKit.DOMCSSRule parent_rule { get; }-		public WebKit.DOMCSSStyleSheet parent_style_sheet { get; }-		[NoAccessorMethod]-		public uint type { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMCSSRuleList : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMCSSRuleList ();-		[CCode (cname = "webkit_dom_css_rule_list_get_length")]-		public ulong get_length ();-		[CCode (cname = "webkit_dom_css_rule_list_item")]-		public unowned WebKit.DOMCSSRule item (ulong index);-		public ulong length { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMCSSStyleDeclaration : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMCSSStyleDeclaration ();-		[CCode (cname = "webkit_dom_css_style_declaration_get_css_text")]-		public unowned string get_css_text ();-		[CCode (cname = "webkit_dom_css_style_declaration_get_length")]-		public ulong get_length ();-		[CCode (cname = "webkit_dom_css_style_declaration_get_parent_rule")]-		public unowned WebKit.DOMCSSRule get_parent_rule ();-		[CCode (cname = "webkit_dom_css_style_declaration_get_property_css_value")]-		public unowned WebKit.DOMCSSValue get_property_css_value (string property_name);-		[CCode (cname = "webkit_dom_css_style_declaration_get_property_priority")]-		public unowned string get_property_priority (string property_name);-		[CCode (cname = "webkit_dom_css_style_declaration_get_property_shorthand")]-		public unowned string get_property_shorthand (string property_name);-		[CCode (cname = "webkit_dom_css_style_declaration_get_property_value")]-		public unowned string get_property_value (string property_name);-		[CCode (cname = "webkit_dom_css_style_declaration_is_property_implicit")]-		public bool is_property_implicit (string property_name);-		[CCode (cname = "webkit_dom_css_style_declaration_item")]-		public unowned string item (ulong index);-		[CCode (cname = "webkit_dom_css_style_declaration_remove_property")]-		public unowned string remove_property (string property_name) throws GLib.Error;-		[CCode (cname = "webkit_dom_css_style_declaration_set_css_text")]-		public void set_css_text (string value) throws GLib.Error;-		[CCode (cname = "webkit_dom_css_style_declaration_set_property")]-		public void set_property (string property_name, string value, string priority) throws GLib.Error;-		public string css_text { get; set; }-		public ulong length { get; }-		public WebKit.DOMCSSRule parent_rule { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMCSSStyleSheet : WebKit.DOMStyleSheet {-		[CCode (has_construct_function = false)]-		protected DOMCSSStyleSheet ();-		[CCode (cname = "webkit_dom_css_style_sheet_add_rule")]-		public long add_rule (string selector, string style, ulong index) throws GLib.Error;-		[CCode (cname = "webkit_dom_css_style_sheet_delete_rule")]-		public void delete_rule (ulong index) throws GLib.Error;-		[CCode (cname = "webkit_dom_css_style_sheet_get_css_rules")]-		public unowned WebKit.DOMCSSRuleList get_css_rules ();-		[CCode (cname = "webkit_dom_css_style_sheet_get_owner_rule")]-		public unowned WebKit.DOMCSSRule get_owner_rule ();-		[CCode (cname = "webkit_dom_css_style_sheet_get_rules")]-		public unowned WebKit.DOMCSSRuleList get_rules ();-		[CCode (cname = "webkit_dom_css_style_sheet_insert_rule")]-		public ulong insert_rule (string rule, ulong index) throws GLib.Error;-		[CCode (cname = "webkit_dom_css_style_sheet_remove_rule")]-		public void remove_rule (ulong index) throws GLib.Error;-		public WebKit.DOMCSSRuleList css_rules { get; }-		public WebKit.DOMCSSRule owner_rule { get; }-		public WebKit.DOMCSSRuleList rules { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMCSSValue : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMCSSValue ();-		[CCode (cname = "webkit_dom_css_value_get_css_text")]-		public unowned string get_css_text ();-		[CCode (cname = "webkit_dom_css_value_get_css_value_type")]-		public ushort get_css_value_type ();-		[CCode (cname = "webkit_dom_css_value_set_css_text")]-		public void set_css_text (string value) throws GLib.Error;-		public string css_text { get; set; }-		public uint css_value_type { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMCharacterData : WebKit.DOMNode, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMCharacterData ();-		public void append_data (string data) throws GLib.Error;-		public void delete_data (ulong offset, ulong length) throws GLib.Error;-		public unowned string get_data ();-		public ulong get_length ();-		public void insert_data (ulong offset, string data) throws GLib.Error;-		public void replace_data (ulong offset, ulong length, string data) throws GLib.Error;-		public void set_data (string value) throws GLib.Error;-		public unowned string substring_data (ulong offset, ulong length) throws GLib.Error;-		public string data { get; set; }-		public ulong length { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMComment : WebKit.DOMCharacterData, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMComment ();-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMConsole : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMConsole ();-		public unowned WebKit.DOMMemoryInfo get_memory ();-		public void group_end ();-		public void time (string title);-		public WebKit.DOMMemoryInfo memory { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	[Compact]-	public class DOMCustom {-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	[Compact]-	public class DOMCustomClass {-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDOMApplicationCache : WebKit.DOMObject, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMDOMApplicationCache ();-		[CCode (cname = "webkit_dom_dom_application_cache_get_status")]-		public ushort get_status ();-		[CCode (cname = "webkit_dom_dom_application_cache_swap_cache")]-		public void swap_cache () throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_application_cache_update")]-		public void update () throws GLib.Error;-		public uint status { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDOMImplementation : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMDOMImplementation ();-		[CCode (cname = "webkit_dom_dom_implementation_create_css_style_sheet")]-		public unowned WebKit.DOMCSSStyleSheet create_css_style_sheet (string title, string media) throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_implementation_create_document")]-		public unowned WebKit.DOMDocument create_document (string namespace_uri, string qualified_name, WebKit.DOMDocumentType doctype) throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_implementation_create_document_type")]-		public unowned WebKit.DOMDocumentType create_document_type (string qualified_name, string public_id, string system_id) throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_implementation_create_html_document")]-		public unowned WebKit.DOMHTMLDocument create_html_document (string title);-		[CCode (cname = "webkit_dom_dom_implementation_has_feature")]-		public bool has_feature (string feature, string version);-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDOMMimeType : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMDOMMimeType ();-		[CCode (cname = "webkit_dom_dom_mime_type_get_description")]-		public unowned string get_description ();-		[CCode (cname = "webkit_dom_dom_mime_type_get_enabled_plugin")]-		public unowned WebKit.DOMDOMPlugin get_enabled_plugin ();-		[CCode (cname = "webkit_dom_dom_mime_type_get_suffixes")]-		public unowned string get_suffixes ();-		public string description { get; }-		public WebKit.DOMDOMPlugin enabled_plugin { get; }-		public string suffixes { get; }-		[NoAccessorMethod]-		public string type { owned get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDOMMimeTypeArray : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMDOMMimeTypeArray ();-		[CCode (cname = "webkit_dom_dom_mime_type_array_get_length")]-		public ulong get_length ();-		[CCode (cname = "webkit_dom_dom_mime_type_array_item")]-		public unowned WebKit.DOMDOMMimeType item (ulong index);-		[CCode (cname = "webkit_dom_dom_mime_type_array_named_item")]-		public unowned WebKit.DOMDOMMimeType named_item (string name);-		public ulong length { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDOMPlugin : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMDOMPlugin ();-		[CCode (cname = "webkit_dom_dom_plugin_get_description")]-		public unowned string get_description ();-		[CCode (cname = "webkit_dom_dom_plugin_get_filename")]-		public unowned string get_filename ();-		[CCode (cname = "webkit_dom_dom_plugin_get_length")]-		public ulong get_length ();-		[CCode (cname = "webkit_dom_dom_plugin_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_dom_plugin_item")]-		public unowned WebKit.DOMDOMMimeType item (ulong index);-		[CCode (cname = "webkit_dom_dom_plugin_named_item")]-		public unowned WebKit.DOMDOMMimeType named_item (string name);-		public string description { get; }-		public string filename { get; }-		public ulong length { get; }-		public string name { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDOMPluginArray : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMDOMPluginArray ();-		[CCode (cname = "webkit_dom_dom_plugin_array_get_length")]-		public ulong get_length ();-		[CCode (cname = "webkit_dom_dom_plugin_array_item")]-		public unowned WebKit.DOMDOMPlugin item (ulong index);-		[CCode (cname = "webkit_dom_dom_plugin_array_named_item")]-		public unowned WebKit.DOMDOMPlugin named_item (string name);-		[CCode (cname = "webkit_dom_dom_plugin_array_refresh")]-		public void refresh (bool reload);-		public ulong length { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDOMSelection : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMDOMSelection ();-		[CCode (cname = "webkit_dom_dom_selection_add_range")]-		public void add_range (WebKit.DOMRange range);-		[CCode (cname = "webkit_dom_dom_selection_collapse")]-		public void collapse (WebKit.DOMNode node, long index) throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_selection_collapse_to_end")]-		public void collapse_to_end () throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_selection_collapse_to_start")]-		public void collapse_to_start () throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_selection_contains_node")]-		public bool contains_node (WebKit.DOMNode node, bool allow_partial);-		[CCode (cname = "webkit_dom_dom_selection_delete_from_document")]-		public void delete_from_document ();-		[CCode (cname = "webkit_dom_dom_selection_empty")]-		public void empty ();-		[CCode (cname = "webkit_dom_dom_selection_extend")]-		public void extend (WebKit.DOMNode node, long offset) throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_selection_get_anchor_node")]-		public unowned WebKit.DOMNode get_anchor_node ();-		[CCode (cname = "webkit_dom_dom_selection_get_anchor_offset")]-		public long get_anchor_offset ();-		[CCode (cname = "webkit_dom_dom_selection_get_base_node")]-		public unowned WebKit.DOMNode get_base_node ();-		[CCode (cname = "webkit_dom_dom_selection_get_base_offset")]-		public long get_base_offset ();-		[CCode (cname = "webkit_dom_dom_selection_get_extent_node")]-		public unowned WebKit.DOMNode get_extent_node ();-		[CCode (cname = "webkit_dom_dom_selection_get_extent_offset")]-		public long get_extent_offset ();-		[CCode (cname = "webkit_dom_dom_selection_get_focus_node")]-		public unowned WebKit.DOMNode get_focus_node ();-		[CCode (cname = "webkit_dom_dom_selection_get_focus_offset")]-		public long get_focus_offset ();-		[CCode (cname = "webkit_dom_dom_selection_get_is_collapsed")]-		public bool get_is_collapsed ();-		[CCode (cname = "webkit_dom_dom_selection_get_range_at")]-		public unowned WebKit.DOMRange get_range_at (long index) throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_selection_get_range_count")]-		public long get_range_count ();-		[CCode (cname = "webkit_dom_dom_selection_modify")]-		public void modify (string alter, string direction, string granularity);-		[CCode (cname = "webkit_dom_dom_selection_remove_all_ranges")]-		public void remove_all_ranges ();-		[CCode (cname = "webkit_dom_dom_selection_select_all_children")]-		public void select_all_children (WebKit.DOMNode node) throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_selection_set_base_and_extent")]-		public void set_base_and_extent (WebKit.DOMNode base_node, long base_offset, WebKit.DOMNode extent_node, long extent_offset) throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_selection_set_position")]-		public void set_position (WebKit.DOMNode node, long offset) throws GLib.Error;-		public WebKit.DOMNode anchor_node { get; }-		public long anchor_offset { get; }-		public WebKit.DOMNode base_node { get; }-		public long base_offset { get; }-		public WebKit.DOMNode extent_node { get; }-		public long extent_offset { get; }-		public WebKit.DOMNode focus_node { get; }-		public long focus_offset { get; }-		public bool is_collapsed { get; }-		public long range_count { get; }-		[NoAccessorMethod]-		public string type { owned get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDOMSettableTokenList : WebKit.DOMDOMTokenList {-		[CCode (has_construct_function = false)]-		protected DOMDOMSettableTokenList ();-		[CCode (cname = "webkit_dom_dom_settable_token_list_get_value")]-		public unowned string get_value ();-		[CCode (cname = "webkit_dom_dom_settable_token_list_set_value")]-		public void set_value (string value);-		public string value { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDOMStringList : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMDOMStringList ();-		[CCode (cname = "webkit_dom_dom_string_list_contains")]-		public bool contains (string str);-		[CCode (cname = "webkit_dom_dom_string_list_get_length")]-		public ulong get_length ();-		[CCode (cname = "webkit_dom_dom_string_list_item")]-		public unowned string item (ulong index);-		public ulong length { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDOMStringMap : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMDOMStringMap ();-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDOMTokenList : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMDOMTokenList ();-		[CCode (cname = "webkit_dom_dom_token_list_add")]-		public void add (string token) throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_token_list_contains")]-		public bool contains (string token) throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_token_list_get_length")]-		public ulong get_length ();-		[CCode (cname = "webkit_dom_dom_token_list_item")]-		public unowned string item (ulong index);-		[CCode (cname = "webkit_dom_dom_token_list_remove")]-		public void remove (string token) throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_token_list_toggle")]-		public bool toggle (string token) throws GLib.Error;-		public ulong length { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDOMWindow : WebKit.DOMObject, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMDOMWindow ();-		[CCode (cname = "webkit_dom_dom_window_alert")]-		public void alert (string message);-		[CCode (cname = "webkit_dom_dom_window_atob")]-		public unowned string atob (string str) throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_window_blur")]-		public void blur ();-		[CCode (cname = "webkit_dom_dom_window_btoa")]-		public unowned string btoa (string str) throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_window_capture_events")]-		public void capture_events ();-		[CCode (cname = "webkit_dom_dom_window_clear_interval")]-		public void clear_interval (long handle);-		[CCode (cname = "webkit_dom_dom_window_clear_timeout")]-		public void clear_timeout (long handle);-		[CCode (cname = "webkit_dom_dom_window_close")]-		public void close ();-		[CCode (cname = "webkit_dom_dom_window_confirm")]-		public bool confirm (string message);-		[CCode (cname = "webkit_dom_dom_window_find")]-		public bool find (string str, bool case_sensitive, bool backwards, bool wrap, bool whole_word, bool search_in_frames, bool show_dialog);-		[CCode (cname = "webkit_dom_dom_window_focus")]-		public void focus ();-		[CCode (cname = "webkit_dom_dom_window_get_application_cache")]-		public unowned WebKit.DOMDOMApplicationCache get_application_cache ();-		[CCode (cname = "webkit_dom_dom_window_get_client_information")]-		public unowned WebKit.DOMNavigator get_client_information ();-		[CCode (cname = "webkit_dom_dom_window_get_closed")]-		public bool get_closed ();-		[CCode (cname = "webkit_dom_dom_window_get_computed_style")]-		public unowned WebKit.DOMCSSStyleDeclaration get_computed_style (WebKit.DOMElement element, string pseudo_element);-		[CCode (cname = "webkit_dom_dom_window_get_console")]-		public unowned WebKit.DOMConsole get_console ();-		[CCode (cname = "webkit_dom_dom_window_get_default_status")]-		public unowned string get_default_status ();-		[CCode (cname = "webkit_dom_dom_window_get_device_pixel_ratio")]-		public double get_device_pixel_ratio ();-		[CCode (cname = "webkit_dom_dom_window_get_document")]-		public unowned WebKit.DOMDocument get_document ();-		[CCode (cname = "webkit_dom_dom_window_get_frame_element")]-		public unowned WebKit.DOMElement get_frame_element ();-		[CCode (cname = "webkit_dom_dom_window_get_frames")]-		public unowned WebKit.DOMDOMWindow get_frames ();-		[CCode (cname = "webkit_dom_dom_window_get_history")]-		public unowned WebKit.DOMHistory get_history ();-		[CCode (cname = "webkit_dom_dom_window_get_inner_height")]-		public long get_inner_height ();-		[CCode (cname = "webkit_dom_dom_window_get_inner_width")]-		public long get_inner_width ();-		[CCode (cname = "webkit_dom_dom_window_get_length")]-		public ulong get_length ();-		[CCode (cname = "webkit_dom_dom_window_get_local_storage")]-		public unowned WebKit.DOMStorage get_local_storage () throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_window_get_locationbar")]-		public unowned WebKit.DOMBarInfo get_locationbar ();-		[CCode (cname = "webkit_dom_dom_window_get_menubar")]-		public unowned WebKit.DOMBarInfo get_menubar ();-		[CCode (cname = "webkit_dom_dom_window_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_dom_window_get_navigator")]-		public unowned WebKit.DOMNavigator get_navigator ();-		[CCode (cname = "webkit_dom_dom_window_get_offscreen_buffering")]-		public bool get_offscreen_buffering ();-		[CCode (cname = "webkit_dom_dom_window_get_opener")]-		public unowned WebKit.DOMDOMWindow get_opener ();-		[CCode (cname = "webkit_dom_dom_window_get_outer_height")]-		public long get_outer_height ();-		[CCode (cname = "webkit_dom_dom_window_get_outer_width")]-		public long get_outer_width ();-		[CCode (cname = "webkit_dom_dom_window_get_page_x_offset")]-		public long get_page_x_offset ();-		[CCode (cname = "webkit_dom_dom_window_get_page_y_offset")]-		public long get_page_y_offset ();-		[CCode (cname = "webkit_dom_dom_window_get_parent")]-		public unowned WebKit.DOMDOMWindow get_parent ();-		[CCode (cname = "webkit_dom_dom_window_get_personalbar")]-		public unowned WebKit.DOMBarInfo get_personalbar ();-		[CCode (cname = "webkit_dom_dom_window_get_screen")]-		public unowned WebKit.DOMScreen get_screen ();-		[CCode (cname = "webkit_dom_dom_window_get_screen_left")]-		public long get_screen_left ();-		[CCode (cname = "webkit_dom_dom_window_get_screen_top")]-		public long get_screen_top ();-		[CCode (cname = "webkit_dom_dom_window_get_screen_x")]-		public long get_screen_x ();-		[CCode (cname = "webkit_dom_dom_window_get_screen_y")]-		public long get_screen_y ();-		[CCode (cname = "webkit_dom_dom_window_get_scroll_x")]-		public long get_scroll_x ();-		[CCode (cname = "webkit_dom_dom_window_get_scroll_y")]-		public long get_scroll_y ();-		[CCode (cname = "webkit_dom_dom_window_get_scrollbars")]-		public unowned WebKit.DOMBarInfo get_scrollbars ();-		[CCode (cname = "webkit_dom_dom_window_get_selection")]-		public unowned WebKit.DOMDOMSelection get_selection ();-		[CCode (cname = "webkit_dom_dom_window_get_self")]-		public unowned WebKit.DOMDOMWindow get_self ();-		[CCode (cname = "webkit_dom_dom_window_get_session_storage")]-		public unowned WebKit.DOMStorage get_session_storage () throws GLib.Error;-		[CCode (cname = "webkit_dom_dom_window_get_status")]-		public unowned string get_status ();-		[CCode (cname = "webkit_dom_dom_window_get_statusbar")]-		public unowned WebKit.DOMBarInfo get_statusbar ();-		[CCode (cname = "webkit_dom_dom_window_get_style_media")]-		public unowned WebKit.DOMStyleMedia get_style_media ();-		[CCode (cname = "webkit_dom_dom_window_get_toolbar")]-		public unowned WebKit.DOMBarInfo get_toolbar ();-		[CCode (cname = "webkit_dom_dom_window_get_top")]-		public unowned WebKit.DOMDOMWindow get_top ();-		[CCode (cname = "webkit_dom_dom_window_get_window")]-		public unowned WebKit.DOMDOMWindow get_window ();-		[CCode (cname = "webkit_dom_dom_window_match_media")]-		public unowned WebKit.DOMMediaQueryList match_media (string query);-		[CCode (cname = "webkit_dom_dom_window_move_by")]-		public void move_by (float x, float y);-		[CCode (cname = "webkit_dom_dom_window_move_to")]-		public void move_to (float x, float y);-		[CCode (cname = "webkit_dom_dom_window_print")]-		public void print ();-		[CCode (cname = "webkit_dom_dom_window_prompt")]-		public unowned string prompt (string message, string default_value);-		[CCode (cname = "webkit_dom_dom_window_release_events")]-		public void release_events ();-		[CCode (cname = "webkit_dom_dom_window_resize_by")]-		public void resize_by (float x, float y);-		[CCode (cname = "webkit_dom_dom_window_resize_to")]-		public void resize_to (float width, float height);-		[CCode (cname = "webkit_dom_dom_window_scroll")]-		public void scroll (long x, long y);-		[CCode (cname = "webkit_dom_dom_window_scroll_by")]-		public void scroll_by (long x, long y);-		[CCode (cname = "webkit_dom_dom_window_scroll_to")]-		public void scroll_to (long x, long y);-		[CCode (cname = "webkit_dom_dom_window_set_default_status")]-		public void set_default_status (string value);-		[CCode (cname = "webkit_dom_dom_window_set_name")]-		public void set_name (string value);-		[CCode (cname = "webkit_dom_dom_window_set_status")]-		public void set_status (string value);-		[CCode (cname = "webkit_dom_dom_window_stop")]-		public void stop ();-		[CCode (cname = "webkit_dom_dom_window_webkit_convert_point_from_node_to_page")]-		public unowned WebKit.DOMWebKitPoint webkit_convert_point_from_node_to_page (WebKit.DOMNode node, WebKit.DOMWebKitPoint p);-		[CCode (cname = "webkit_dom_dom_window_webkit_convert_point_from_page_to_node")]-		public unowned WebKit.DOMWebKitPoint webkit_convert_point_from_page_to_node (WebKit.DOMNode node, WebKit.DOMWebKitPoint p);-		public WebKit.DOMDOMApplicationCache application_cache { get; }-		[NoAccessorMethod]-		public WebKit.DOMNavigator client_information { owned get; set; }-		public bool closed { get; }-		[NoAccessorMethod]-		public WebKit.DOMConsole console { owned get; set; }-		public string default_status { get; set; }-		[NoAccessorMethod]-		public double device_pixel_ratio { get; set; }-		public WebKit.DOMDocument document { get; }-		public WebKit.DOMElement frame_element { get; }-		[NoAccessorMethod]-		public WebKit.DOMDOMWindow frames { owned get; set; }-		[NoAccessorMethod]-		public WebKit.DOMHistory history { owned get; set; }-		[NoAccessorMethod]-		public long inner_height { get; set; }-		[NoAccessorMethod]-		public long inner_width { get; set; }-		[NoAccessorMethod]-		public ulong length { get; set; }-		public WebKit.DOMStorage local_storage { get; }-		[NoAccessorMethod]-		public WebKit.DOMBarInfo locationbar { owned get; set; }-		[NoAccessorMethod]-		public WebKit.DOMBarInfo menubar { owned get; set; }-		public string name { get; set; }-		[NoAccessorMethod]-		public WebKit.DOMNavigator navigator { owned get; set; }-		[NoAccessorMethod]-		public bool offscreen_buffering { get; set; }-		[NoAccessorMethod]-		public WebKit.DOMDOMWindow opener { owned get; set; }-		[NoAccessorMethod]-		public long outer_height { get; set; }-		[NoAccessorMethod]-		public long outer_width { get; set; }-		public long page_x_offset { get; }-		public long page_y_offset { get; }-		[NoAccessorMethod]-		public WebKit.DOMDOMWindow parent { owned get; set; }-		[NoAccessorMethod]-		public WebKit.DOMBarInfo personalbar { owned get; set; }-		[NoAccessorMethod]-		public WebKit.DOMScreen screen { owned get; set; }-		[NoAccessorMethod]-		public long screen_left { get; set; }-		[NoAccessorMethod]-		public long screen_top { get; set; }-		[NoAccessorMethod]-		public long screen_x { get; set; }-		[NoAccessorMethod]-		public long screen_y { get; set; }-		[NoAccessorMethod]-		public long scroll_x { get; set; }-		[NoAccessorMethod]-		public long scroll_y { get; set; }-		[NoAccessorMethod]-		public WebKit.DOMBarInfo scrollbars { owned get; set; }-		[NoAccessorMethod]-		public WebKit.DOMDOMWindow self { owned get; set; }-		public WebKit.DOMStorage session_storage { get; }-		public string status { get; set; }-		[NoAccessorMethod]-		public WebKit.DOMBarInfo statusbar { owned get; set; }-		public WebKit.DOMStyleMedia style_media { get; }-		[NoAccessorMethod]-		public WebKit.DOMBarInfo toolbar { owned get; set; }-		[NoAccessorMethod]-		public WebKit.DOMDOMWindow top { owned get; set; }-		public WebKit.DOMDOMWindow window { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDatabase : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMDatabase ();-		public unowned string get_version ();-		public string version { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDocument : WebKit.DOMNode, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMDocument ();-		public unowned WebKit.DOMNode adopt_node (WebKit.DOMNode source) throws GLib.Error;-		public unowned WebKit.DOMRange caret_range_from_point (long x, long y);-		public unowned WebKit.DOMAttr create_attribute (string name) throws GLib.Error;-		public unowned WebKit.DOMAttr create_attribute_ns (string namespace_uri, string qualified_name) throws GLib.Error;-		public unowned WebKit.DOMCDATASection create_cdata_section (string data) throws GLib.Error;-		public unowned WebKit.DOMComment create_comment (string data);-		public unowned WebKit.DOMCSSStyleDeclaration create_css_style_declaration ();-		public unowned WebKit.DOMDocumentFragment create_document_fragment ();-		public unowned WebKit.DOMElement create_element (string tag_name) throws GLib.Error;-		public unowned WebKit.DOMElement create_element_ns (string namespace_uri, string qualified_name) throws GLib.Error;-		public unowned WebKit.DOMEntityReference create_entity_reference (string name) throws GLib.Error;-		public unowned WebKit.DOMEvent create_event (string event_type) throws GLib.Error;-		public unowned WebKit.DOMXPathExpression create_expression (string expression, WebKit.DOMXPathNSResolver resolver) throws GLib.Error;-		public unowned WebKit.DOMNodeIterator create_node_iterator (WebKit.DOMNode root, ulong what_to_show, WebKit.DOMNodeFilter filter, bool expand_entity_references) throws GLib.Error;-		public unowned WebKit.DOMXPathNSResolver create_ns_resolver (WebKit.DOMNode node_resolver);-		public unowned WebKit.DOMProcessingInstruction create_processing_instruction (string target, string data) throws GLib.Error;-		public unowned WebKit.DOMRange create_range ();-		public unowned WebKit.DOMText create_text_node (string data);-		public unowned WebKit.DOMTreeWalker create_tree_walker (WebKit.DOMNode root, ulong what_to_show, WebKit.DOMNodeFilter filter, bool expand_entity_references) throws GLib.Error;-		public unowned WebKit.DOMElement element_from_point (long x, long y);-		public unowned WebKit.DOMXPathResult evaluate (string expression, WebKit.DOMNode context_node, WebKit.DOMXPathNSResolver resolver, ushort type, WebKit.DOMXPathResult in_result) throws GLib.Error;-		public bool exec_command (string command, bool user_interface, string value);-		public unowned WebKit.DOMHTMLCollection get_anchors ();-		public unowned WebKit.DOMHTMLCollection get_applets ();-		public unowned WebKit.DOMHTMLElement get_body ();-		public unowned string get_character_set ();-		public unowned string get_charset ();-		public unowned string get_compat_mode ();-		public unowned string get_cookie () throws GLib.Error;-		public unowned string get_default_charset ();-		public unowned WebKit.DOMDOMWindow get_default_view ();-		public unowned WebKit.DOMDocumentType get_doctype ();-		public unowned WebKit.DOMElement get_document_element ();-		public unowned string get_document_uri ();-		public unowned string get_domain ();-		public unowned WebKit.DOMElement get_element_by_id (string element_id);-		public unowned WebKit.DOMNodeList get_elements_by_class_name (string tagname);-		public unowned WebKit.DOMNodeList get_elements_by_name (string element_name);-		public unowned WebKit.DOMNodeList get_elements_by_tag_name (string tagname);-		public unowned WebKit.DOMNodeList get_elements_by_tag_name_ns (string namespace_uri, string local_name);-		public unowned WebKit.DOMHTMLCollection get_forms ();-		public unowned WebKit.DOMHTMLHeadElement get_head ();-		public unowned WebKit.DOMHTMLCollection get_images ();-		public unowned WebKit.DOMDOMImplementation get_implementation ();-		public unowned string get_input_encoding ();-		public unowned string get_last_modified ();-		public unowned WebKit.DOMHTMLCollection get_links ();-		public unowned WebKit.DOMCSSStyleDeclaration get_override_style (WebKit.DOMElement element, string pseudo_element);-		public unowned string get_preferred_stylesheet_set ();-		public unowned string get_ready_state ();-		public unowned string get_referrer ();-		public unowned string get_selected_stylesheet_set ();-		public unowned WebKit.DOMStyleSheetList get_style_sheets ();-		public unowned string get_title ();-		public unowned WebKit.DOMElement get_webkit_current_full_screen_element ();-		public bool get_webkit_full_screen_keyboard_input_allowed ();-		public bool get_webkit_hidden ();-		public bool get_webkit_is_full_screen ();-		public unowned string get_webkit_visibility_state ();-		public unowned string get_xml_encoding ();-		public bool get_xml_standalone ();-		public unowned string get_xml_version ();-		public unowned WebKit.DOMNode import_node (WebKit.DOMNode imported_node, bool deep) throws GLib.Error;-		public bool query_command_enabled (string command);-		public bool query_command_indeterm (string command);-		public bool query_command_state (string command);-		public bool query_command_supported (string command);-		public unowned string query_command_value (string command);-		public unowned WebKit.DOMElement query_selector (string selectors) throws GLib.Error;-		public unowned WebKit.DOMNodeList query_selector_all (string selectors) throws GLib.Error;-		public void set_body (WebKit.DOMHTMLElement value) throws GLib.Error;-		public void set_charset (string value);-		public void set_cookie (string value) throws GLib.Error;-		public void set_document_uri (string value);-		public void set_selected_stylesheet_set (string value);-		public void set_title (string value);-		public void set_xml_standalone (bool value) throws GLib.Error;-		public void set_xml_version (string value) throws GLib.Error;-		public void webkit_cancel_full_screen ();-		public WebKit.DOMHTMLCollection anchors { get; }-		public WebKit.DOMHTMLCollection applets { get; }-		public WebKit.DOMHTMLElement body { get; set; }-		public string character_set { get; }-		public string charset { get; set; }-		public string compat_mode { get; }-		public string cookie { get; set; }-		public string default_charset { get; }-		public WebKit.DOMDOMWindow default_view { get; }-		public WebKit.DOMDocumentType doctype { get; }-		public WebKit.DOMElement document_element { get; }-		public string document_uri { get; set; }-		public string domain { get; }-		public WebKit.DOMHTMLCollection forms { get; }-		public WebKit.DOMHTMLHeadElement head { get; }-		public WebKit.DOMHTMLCollection images { get; }-		public WebKit.DOMDOMImplementation implementation { get; }-		public string input_encoding { get; }-		public string last_modified { get; }-		public WebKit.DOMHTMLCollection links { get; }-		public string preferred_stylesheet_set { get; }-		public string ready_state { get; }-		public string referrer { get; }-		public string selected_stylesheet_set { get; set; }-		public WebKit.DOMStyleSheetList style_sheets { get; }-		public string title { get; set; }-		[NoAccessorMethod]-		public string url { owned get; }-		public WebKit.DOMElement webkit_current_full_screen_element { get; }-		public bool webkit_full_screen_keyboard_input_allowed { get; }-		public bool webkit_is_full_screen { get; }-		public string xml_encoding { get; }-		public bool xml_standalone { get; set; }-		public string xml_version { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDocumentFragment : WebKit.DOMNode, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMDocumentFragment ();-		public unowned WebKit.DOMElement query_selector (string selectors) throws GLib.Error;-		public unowned WebKit.DOMNodeList query_selector_all (string selectors) throws GLib.Error;-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMDocumentType : WebKit.DOMNode, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMDocumentType ();-		public unowned WebKit.DOMNamedNodeMap get_entities ();-		public unowned string get_internal_subset ();-		public unowned string get_name ();-		public unowned WebKit.DOMNamedNodeMap get_notations ();-		public unowned string get_public_id ();-		public unowned string get_system_id ();-		public WebKit.DOMNamedNodeMap entities { get; }-		public string internal_subset { get; }-		public string name { get; }-		public WebKit.DOMNamedNodeMap notations { get; }-		public string public_id { get; }-		public string system_id { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMElement : WebKit.DOMNode, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMElement ();-		public void blur ();-		public void focus ();-		public unowned string get_attribute (string name);-		public unowned WebKit.DOMAttr get_attribute_node (string name);-		public unowned WebKit.DOMAttr get_attribute_node_ns (string namespace_uri, string local_name);-		public unowned string get_attribute_ns (string namespace_uri, string local_name);-		public ulong get_child_element_count ();-		public long get_client_height ();-		public long get_client_left ();-		public long get_client_top ();-		public long get_client_width ();-		public unowned WebKit.DOMNodeList get_elements_by_class_name (string name);-		public unowned WebKit.DOMNodeList get_elements_by_tag_name (string name);-		public unowned WebKit.DOMNodeList get_elements_by_tag_name_ns (string namespace_uri, string local_name);-		public unowned WebKit.DOMElement get_first_element_child ();-		public unowned WebKit.DOMElement get_last_element_child ();-		public unowned WebKit.DOMElement get_next_element_sibling ();-		public long get_offset_height ();-		public long get_offset_left ();-		public unowned WebKit.DOMElement get_offset_parent ();-		public long get_offset_top ();-		public long get_offset_width ();-		public unowned WebKit.DOMElement get_previous_element_sibling ();-		public long get_scroll_height ();-		public long get_scroll_left ();-		public long get_scroll_top ();-		public long get_scroll_width ();-		public unowned WebKit.DOMCSSStyleDeclaration get_style ();-		public unowned string get_tag_name ();-		public bool has_attribute (string name);-		public bool has_attribute_ns (string namespace_uri, string local_name);-		public unowned WebKit.DOMElement query_selector (string selectors) throws GLib.Error;-		public unowned WebKit.DOMNodeList query_selector_all (string selectors) throws GLib.Error;-		public void remove_attribute (string name) throws GLib.Error;-		public unowned WebKit.DOMAttr remove_attribute_node (WebKit.DOMAttr old_attr) throws GLib.Error;-		public void remove_attribute_ns (string namespace_uri, string local_name) throws GLib.Error;-		public void scroll_by_lines (long lines);-		public void scroll_by_pages (long pages);-		public void scroll_into_view (bool align_with_top);-		public void scroll_into_view_if_needed (bool center_if_needed);-		public void set_attribute (string name, string value) throws GLib.Error;-		public unowned WebKit.DOMAttr set_attribute_node (WebKit.DOMAttr new_attr) throws GLib.Error;-		public unowned WebKit.DOMAttr set_attribute_node_ns (WebKit.DOMAttr new_attr) throws GLib.Error;-		public void set_attribute_ns (string namespace_uri, string qualified_name, string value) throws GLib.Error;-		public void set_scroll_left (long value);-		public void set_scroll_top (long value);-		public bool webkit_matches_selector (string selectors) throws GLib.Error;-		public void webkit_request_full_screen (ushort flags);-		public ulong child_element_count { get; }-		public long client_height { get; }-		public long client_left { get; }-		public long client_top { get; }-		public long client_width { get; }-		public WebKit.DOMElement first_element_child { get; }-		public WebKit.DOMElement last_element_child { get; }-		public WebKit.DOMElement next_element_sibling { get; }-		public long offset_height { get; }-		public long offset_left { get; }-		public WebKit.DOMElement offset_parent { get; }-		public long offset_top { get; }-		public long offset_width { get; }-		public WebKit.DOMElement previous_element_sibling { get; }-		public long scroll_height { get; }-		public long scroll_left { get; set; }-		public long scroll_top { get; set; }-		public long scroll_width { get; }-		public WebKit.DOMCSSStyleDeclaration style { get; }-		public string tag_name { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMEntityReference : WebKit.DOMNode, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMEntityReference ();-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMEvent : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMEvent ();-		public bool get_bubbles ();-		public bool get_cancel_bubble ();-		public bool get_cancelable ();-		public unowned WebKit.DOMEventTarget get_current_target ();-		public bool get_default_prevented ();-		public ushort get_event_phase ();-		public bool get_return_value ();-		public unowned WebKit.DOMEventTarget get_src_element ();-		public unowned WebKit.DOMEventTarget get_target ();-		public uint32 get_time_stamp ();-		public void init_event (string event_type_arg, bool can_bubble_arg, bool cancelable_arg);-		public void prevent_default ();-		public void set_cancel_bubble (bool value);-		public void set_return_value (bool value);-		public void stop_immediate_propagation ();-		public void stop_propagation ();-		public bool bubbles { get; }-		public bool cancel_bubble { get; set; }-		public bool cancelable { get; }-		public WebKit.DOMEventTarget current_target { get; }-		public bool default_prevented { get; }-		public uint event_phase { get; }-		public bool return_value { get; set; }-		public WebKit.DOMEventTarget src_element { get; }-		public WebKit.DOMEventTarget target { get; }-		public uint time_stamp { get; }-		[NoAccessorMethod]-		public string type { owned get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	[Compact]-	public class DOMEventTargetClass {-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMFile : WebKit.DOMBlob {-		[CCode (has_construct_function = false)]-		protected DOMFile ();-		public unowned string get_file_name ();-		public uint64 get_file_size ();-		public unowned string get_name ();-		public string file_name { get; }-		public uint64 file_size { get; }-		public string name { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMFileList : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMFileList ();-		public ulong get_length ();-		public unowned WebKit.DOMFile item (ulong index);-		public ulong length { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMGeolocation : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMGeolocation ();-		public void clear_watch (long watch_id);-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLAnchorElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLAnchorElement ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_access_key")]-		public unowned string get_access_key ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_charset")]-		public unowned string get_charset ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_coords")]-		public unowned string get_coords ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_download")]-		public unowned string get_download ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_hash")]-		public unowned string get_hash ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_host")]-		public unowned string get_host ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_hostname")]-		public unowned string get_hostname ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_href")]-		public unowned string get_href ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_hreflang")]-		public unowned string get_hreflang ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_origin")]-		public unowned string get_origin ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_parameter")]-		public unowned string get_parameter (string name);-		[CCode (cname = "webkit_dom_html_anchor_element_get_pathname")]-		public unowned string get_pathname ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_ping")]-		public unowned string get_ping ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_port")]-		public unowned string get_port ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_protocol")]-		public unowned string get_protocol ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_rel")]-		public unowned string get_rel ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_rev")]-		public unowned string get_rev ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_search")]-		public unowned string get_search ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_shape")]-		public unowned string get_shape ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_target")]-		public unowned string get_target ();-		[CCode (cname = "webkit_dom_html_anchor_element_get_text")]-		public unowned string get_text ();-		[CCode (cname = "webkit_dom_html_anchor_element_set_access_key")]-		public void set_access_key (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_charset")]-		public void set_charset (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_coords")]-		public void set_coords (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_download")]-		public void set_download (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_hash")]-		public void set_hash (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_host")]-		public void set_host (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_hostname")]-		public void set_hostname (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_href")]-		public void set_href (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_hreflang")]-		public void set_hreflang (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_name")]-		public void set_name (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_pathname")]-		public void set_pathname (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_ping")]-		public void set_ping (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_port")]-		public void set_port (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_protocol")]-		public void set_protocol (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_rel")]-		public void set_rel (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_rev")]-		public void set_rev (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_search")]-		public void set_search (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_shape")]-		public void set_shape (string value);-		[CCode (cname = "webkit_dom_html_anchor_element_set_target")]-		public void set_target (string value);-		public string access_key { get; set; }-		public string charset { get; set; }-		public string coords { get; set; }-		public string hash { get; set; }-		public string host { get; set; }-		public string hostname { get; set; }-		public string href { get; set; }-		public string hreflang { get; set; }-		public string name { get; set; }-		public string origin { get; }-		public string pathname { get; set; }-		public string ping { get; set; }-		public string port { get; set; }-		public string protocol { get; set; }-		public string rel { get; set; }-		public string rev { get; set; }-		public string search { get; set; }-		public string shape { get; set; }-		public string target { get; set; }-		public string text { get; }-		[NoAccessorMethod]-		public string type { owned get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLAppletElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLAppletElement ();-		[CCode (cname = "webkit_dom_html_applet_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_applet_element_get_alt")]-		public unowned string get_alt ();-		[CCode (cname = "webkit_dom_html_applet_element_get_archive")]-		public unowned string get_archive ();-		[CCode (cname = "webkit_dom_html_applet_element_get_code")]-		public unowned string get_code ();-		[CCode (cname = "webkit_dom_html_applet_element_get_code_base")]-		public unowned string get_code_base ();-		[CCode (cname = "webkit_dom_html_applet_element_get_height")]-		public unowned string get_height ();-		[CCode (cname = "webkit_dom_html_applet_element_get_hspace")]-		public long get_hspace ();-		[CCode (cname = "webkit_dom_html_applet_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_applet_element_get_object")]-		public unowned string get_object ();-		[CCode (cname = "webkit_dom_html_applet_element_get_vspace")]-		public long get_vspace ();-		[CCode (cname = "webkit_dom_html_applet_element_get_width")]-		public unowned string get_width ();-		[CCode (cname = "webkit_dom_html_applet_element_set_align")]-		public void set_align (string value);-		[CCode (cname = "webkit_dom_html_applet_element_set_alt")]-		public void set_alt (string value);-		[CCode (cname = "webkit_dom_html_applet_element_set_archive")]-		public void set_archive (string value);-		[CCode (cname = "webkit_dom_html_applet_element_set_code")]-		public void set_code (string value);-		[CCode (cname = "webkit_dom_html_applet_element_set_code_base")]-		public void set_code_base (string value);-		[CCode (cname = "webkit_dom_html_applet_element_set_height")]-		public void set_height (string value);-		[CCode (cname = "webkit_dom_html_applet_element_set_hspace")]-		public void set_hspace (long value);-		[CCode (cname = "webkit_dom_html_applet_element_set_name")]-		public void set_name (string value);-		[CCode (cname = "webkit_dom_html_applet_element_set_object")]-		public void set_object (string value);-		[CCode (cname = "webkit_dom_html_applet_element_set_vspace")]-		public void set_vspace (long value);-		[CCode (cname = "webkit_dom_html_applet_element_set_width")]-		public void set_width (string value);-		public string align { get; set; }-		public string alt { get; set; }-		public string archive { get; set; }-		public string code { get; set; }-		public string code_base { get; set; }-		public string height { get; set; }-		public long hspace { get; set; }-		public string name { get; set; }-		public string object { get; set; }-		public long vspace { get; set; }-		public string width { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLAreaElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLAreaElement ();-		[CCode (cname = "webkit_dom_html_area_element_get_access_key")]-		public unowned string get_access_key ();-		[CCode (cname = "webkit_dom_html_area_element_get_alt")]-		public unowned string get_alt ();-		[CCode (cname = "webkit_dom_html_area_element_get_coords")]-		public unowned string get_coords ();-		[CCode (cname = "webkit_dom_html_area_element_get_hash")]-		public unowned string get_hash ();-		[CCode (cname = "webkit_dom_html_area_element_get_host")]-		public unowned string get_host ();-		[CCode (cname = "webkit_dom_html_area_element_get_hostname")]-		public unowned string get_hostname ();-		[CCode (cname = "webkit_dom_html_area_element_get_href")]-		public unowned string get_href ();-		[CCode (cname = "webkit_dom_html_area_element_get_no_href")]-		public bool get_no_href ();-		[CCode (cname = "webkit_dom_html_area_element_get_pathname")]-		public unowned string get_pathname ();-		[CCode (cname = "webkit_dom_html_area_element_get_ping")]-		public unowned string get_ping ();-		[CCode (cname = "webkit_dom_html_area_element_get_port")]-		public unowned string get_port ();-		[CCode (cname = "webkit_dom_html_area_element_get_protocol")]-		public unowned string get_protocol ();-		[CCode (cname = "webkit_dom_html_area_element_get_search")]-		public unowned string get_search ();-		[CCode (cname = "webkit_dom_html_area_element_get_shape")]-		public unowned string get_shape ();-		[CCode (cname = "webkit_dom_html_area_element_get_target")]-		public unowned string get_target ();-		[CCode (cname = "webkit_dom_html_area_element_set_access_key")]-		public void set_access_key (string value);-		[CCode (cname = "webkit_dom_html_area_element_set_alt")]-		public void set_alt (string value);-		[CCode (cname = "webkit_dom_html_area_element_set_coords")]-		public void set_coords (string value);-		[CCode (cname = "webkit_dom_html_area_element_set_href")]-		public void set_href (string value);-		[CCode (cname = "webkit_dom_html_area_element_set_no_href")]-		public void set_no_href (bool value);-		[CCode (cname = "webkit_dom_html_area_element_set_ping")]-		public void set_ping (string value);-		[CCode (cname = "webkit_dom_html_area_element_set_shape")]-		public void set_shape (string value);-		[CCode (cname = "webkit_dom_html_area_element_set_target")]-		public void set_target (string value);-		public string access_key { get; set; }-		public string alt { get; set; }-		public string coords { get; set; }-		public string hash { get; }-		public string host { get; }-		public string hostname { get; }-		public string href { get; set; }-		public bool no_href { get; set; }-		public string pathname { get; }-		public string ping { get; set; }-		public string port { get; }-		public string protocol { get; }-		public string search { get; }-		public string shape { get; set; }-		public string target { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLAudioElement : WebKit.DOMHTMLMediaElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLAudioElement ();-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLBRElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLBRElement ();-		[CCode (cname = "webkit_dom_htmlbr_element_get_clear")]-		public unowned string get_clear ();-		[CCode (cname = "webkit_dom_htmlbr_element_set_clear")]-		public void set_clear (string value);-		public string clear { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLBaseElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLBaseElement ();-		[CCode (cname = "webkit_dom_html_base_element_get_href")]-		public unowned string get_href ();-		[CCode (cname = "webkit_dom_html_base_element_get_target")]-		public unowned string get_target ();-		[CCode (cname = "webkit_dom_html_base_element_set_href")]-		public void set_href (string value);-		[CCode (cname = "webkit_dom_html_base_element_set_target")]-		public void set_target (string value);-		public string href { get; set; }-		public string target { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLBaseFontElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLBaseFontElement ();-		[CCode (cname = "webkit_dom_html_base_font_element_get_color")]-		public unowned string get_color ();-		[CCode (cname = "webkit_dom_html_base_font_element_get_face")]-		public unowned string get_face ();-		[CCode (cname = "webkit_dom_html_base_font_element_get_size")]-		public long get_size ();-		[CCode (cname = "webkit_dom_html_base_font_element_set_color")]-		public void set_color (string value);-		[CCode (cname = "webkit_dom_html_base_font_element_set_face")]-		public void set_face (string value);-		[CCode (cname = "webkit_dom_html_base_font_element_set_size")]-		public void set_size (long value);-		public string color { get; set; }-		public string face { get; set; }-		public long size { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLBodyElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLBodyElement ();-		[CCode (cname = "webkit_dom_html_body_element_get_a_link")]-		public unowned string get_a_link ();-		[CCode (cname = "webkit_dom_html_body_element_get_background")]-		public unowned string get_background ();-		[CCode (cname = "webkit_dom_html_body_element_get_bg_color")]-		public unowned string get_bg_color ();-		[CCode (cname = "webkit_dom_html_body_element_get_link")]-		public unowned string get_link ();-		[CCode (cname = "webkit_dom_html_body_element_get_text")]-		public unowned string get_text ();-		[CCode (cname = "webkit_dom_html_body_element_get_v_link")]-		public unowned string get_v_link ();-		[CCode (cname = "webkit_dom_html_body_element_set_a_link")]-		public void set_a_link (string value);-		[CCode (cname = "webkit_dom_html_body_element_set_background")]-		public void set_background (string value);-		[CCode (cname = "webkit_dom_html_body_element_set_bg_color")]-		public void set_bg_color (string value);-		[CCode (cname = "webkit_dom_html_body_element_set_link")]-		public void set_link (string value);-		[CCode (cname = "webkit_dom_html_body_element_set_text")]-		public void set_text (string value);-		[CCode (cname = "webkit_dom_html_body_element_set_v_link")]-		public void set_v_link (string value);-		public string a_link { get; set; }-		public string background { get; set; }-		public string bg_color { get; set; }-		public string link { get; set; }-		public string text { get; set; }-		public string v_link { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLButtonElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLButtonElement ();-		[CCode (cname = "webkit_dom_html_button_element_check_validity")]-		public bool check_validity ();-		[CCode (cname = "webkit_dom_html_button_element_click")]-		public void click ();-		[CCode (cname = "webkit_dom_html_button_element_get_access_key")]-		public unowned string get_access_key ();-		[CCode (cname = "webkit_dom_html_button_element_get_autofocus")]-		public bool get_autofocus ();-		[CCode (cname = "webkit_dom_html_button_element_get_disabled")]-		public bool get_disabled ();-		[CCode (cname = "webkit_dom_html_button_element_get_form")]-		public unowned WebKit.DOMHTMLFormElement get_form ();-		[CCode (cname = "webkit_dom_html_button_element_get_form_action")]-		public unowned string get_form_action ();-		[CCode (cname = "webkit_dom_html_button_element_get_form_enctype")]-		public unowned string get_form_enctype ();-		[CCode (cname = "webkit_dom_html_button_element_get_form_method")]-		public unowned string get_form_method ();-		[CCode (cname = "webkit_dom_html_button_element_get_form_no_validate")]-		public bool get_form_no_validate ();-		[CCode (cname = "webkit_dom_html_button_element_get_form_target")]-		public unowned string get_form_target ();-		[CCode (cname = "webkit_dom_html_button_element_get_labels")]-		public unowned WebKit.DOMNodeList get_labels ();-		[CCode (cname = "webkit_dom_html_button_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_button_element_get_validation_message")]-		public unowned string get_validation_message ();-		[CCode (cname = "webkit_dom_html_button_element_get_validity")]-		public unowned WebKit.DOMValidityState get_validity ();-		[CCode (cname = "webkit_dom_html_button_element_get_value")]-		public unowned string get_value ();-		[CCode (cname = "webkit_dom_html_button_element_get_will_validate")]-		public bool get_will_validate ();-		[CCode (cname = "webkit_dom_html_button_element_set_access_key")]-		public void set_access_key (string value);-		[CCode (cname = "webkit_dom_html_button_element_set_autofocus")]-		public void set_autofocus (bool value);-		[CCode (cname = "webkit_dom_html_button_element_set_custom_validity")]-		public void set_custom_validity (string error);-		[CCode (cname = "webkit_dom_html_button_element_set_disabled")]-		public void set_disabled (bool value);-		[CCode (cname = "webkit_dom_html_button_element_set_form_action")]-		public void set_form_action (string value);-		[CCode (cname = "webkit_dom_html_button_element_set_form_enctype")]-		public void set_form_enctype (string value);-		[CCode (cname = "webkit_dom_html_button_element_set_form_method")]-		public void set_form_method (string value);-		[CCode (cname = "webkit_dom_html_button_element_set_form_no_validate")]-		public void set_form_no_validate (bool value);-		[CCode (cname = "webkit_dom_html_button_element_set_form_target")]-		public void set_form_target (string value);-		[CCode (cname = "webkit_dom_html_button_element_set_name")]-		public void set_name (string value);-		[CCode (cname = "webkit_dom_html_button_element_set_value")]-		public void set_value (string value);-		public string access_key { get; set; }-		public bool autofocus { get; set; }-		public bool disabled { get; set; }-		public WebKit.DOMHTMLFormElement form { get; }-		public string form_action { get; set; }-		public string form_enctype { get; set; }-		public string form_method { get; set; }-		public bool form_no_validate { get; set; }-		public string form_target { get; set; }-		public WebKit.DOMNodeList labels { get; }-		public string name { get; set; }-		[NoAccessorMethod]-		public string type { owned get; }-		public string validation_message { get; }-		public WebKit.DOMValidityState validity { get; }-		public string value { get; set; }-		public bool will_validate { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLCanvasElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLCanvasElement ();-		[CCode (cname = "webkit_dom_html_canvas_element_get_height")]-		public long get_height ();-		[CCode (cname = "webkit_dom_html_canvas_element_get_width")]-		public long get_width ();-		[CCode (cname = "webkit_dom_html_canvas_element_set_height")]-		public void set_height (long value);-		[CCode (cname = "webkit_dom_html_canvas_element_set_width")]-		public void set_width (long value);-		public long height { get; set; }-		public long width { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLCollection : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMHTMLCollection ();-		[CCode (cname = "webkit_dom_html_collection_get_length")]-		public ulong get_length ();-		[CCode (cname = "webkit_dom_html_collection_item")]-		public unowned WebKit.DOMNode item (ulong index);-		[CCode (cname = "webkit_dom_html_collection_named_item")]-		public unowned WebKit.DOMNode named_item (string name);-		public ulong length { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLDListElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLDListElement ();-		[CCode (cname = "webkit_dom_htmld_list_element_get_compact")]-		public bool get_compact ();-		[CCode (cname = "webkit_dom_htmld_list_element_set_compact")]-		public void set_compact (bool value);-		public bool compact { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLDetailsElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLDetailsElement ();-		[CCode (cname = "webkit_dom_html_details_element_get_open")]-		public bool get_open ();-		[CCode (cname = "webkit_dom_html_details_element_set_open")]-		public void set_open (bool value);-		public bool open { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLDirectoryElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLDirectoryElement ();-		[CCode (cname = "webkit_dom_html_directory_element_get_compact")]-		public bool get_compact ();-		[CCode (cname = "webkit_dom_html_directory_element_set_compact")]-		public void set_compact (bool value);-		public bool compact { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLDivElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLDivElement ();-		[CCode (cname = "webkit_dom_html_div_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_div_element_set_align")]-		public void set_align (string value);-		public string align { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLDocument : WebKit.DOMDocument, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLDocument ();-		[CCode (cname = "webkit_dom_html_document_capture_events")]-		public void capture_events ();-		[CCode (cname = "webkit_dom_html_document_clear")]-		public void clear ();-		[CCode (cname = "webkit_dom_html_document_close")]-		public void close ();-		[CCode (cname = "webkit_dom_html_document_get_active_element")]-		public unowned WebKit.DOMElement get_active_element ();-		[CCode (cname = "webkit_dom_html_document_get_alink_color")]-		public unowned string get_alink_color ();-		[CCode (cname = "webkit_dom_html_document_get_bg_color")]-		public unowned string get_bg_color ();-		[CCode (cname = "webkit_dom_html_document_get_compat_mode")]-		public unowned string get_compat_mode ();-		[CCode (cname = "webkit_dom_html_document_get_design_mode")]-		public unowned string get_design_mode ();-		[CCode (cname = "webkit_dom_html_document_get_dir")]-		public unowned string get_dir ();-		[CCode (cname = "webkit_dom_html_document_get_embeds")]-		public unowned WebKit.DOMHTMLCollection get_embeds ();-		[CCode (cname = "webkit_dom_html_document_get_fg_color")]-		public unowned string get_fg_color ();-		[CCode (cname = "webkit_dom_html_document_get_height")]-		public long get_height ();-		[CCode (cname = "webkit_dom_html_document_get_link_color")]-		public unowned string get_link_color ();-		[CCode (cname = "webkit_dom_html_document_get_plugins")]-		public unowned WebKit.DOMHTMLCollection get_plugins ();-		[CCode (cname = "webkit_dom_html_document_get_scripts")]-		public unowned WebKit.DOMHTMLCollection get_scripts ();-		[CCode (cname = "webkit_dom_html_document_get_vlink_color")]-		public unowned string get_vlink_color ();-		[CCode (cname = "webkit_dom_html_document_get_width")]-		public long get_width ();-		[CCode (cname = "webkit_dom_html_document_has_focus")]-		public bool has_focus ();-		[CCode (cname = "webkit_dom_html_document_release_events")]-		public void release_events ();-		[CCode (cname = "webkit_dom_html_document_set_alink_color")]-		public void set_alink_color (string value);-		[CCode (cname = "webkit_dom_html_document_set_bg_color")]-		public void set_bg_color (string value);-		[CCode (cname = "webkit_dom_html_document_set_design_mode")]-		public void set_design_mode (string value);-		[CCode (cname = "webkit_dom_html_document_set_dir")]-		public void set_dir (string value);-		[CCode (cname = "webkit_dom_html_document_set_fg_color")]-		public void set_fg_color (string value);-		[CCode (cname = "webkit_dom_html_document_set_link_color")]-		public void set_link_color (string value);-		[CCode (cname = "webkit_dom_html_document_set_vlink_color")]-		public void set_vlink_color (string value);-		public WebKit.DOMElement active_element { get; }-		public string alink_color { get; set; }-		public string bg_color { get; set; }-		public string compat_mode { get; }-		public string design_mode { get; set; }-		public string dir { get; set; }-		public WebKit.DOMHTMLCollection embeds { get; }-		public string fg_color { get; set; }-		public long height { get; }-		public string link_color { get; set; }-		public WebKit.DOMHTMLCollection plugins { get; }-		public WebKit.DOMHTMLCollection scripts { get; }-		public string vlink_color { get; set; }-		public long width { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLElement : WebKit.DOMElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLElement ();-		[CCode (cname = "webkit_dom_html_element_get_children")]-		public unowned WebKit.DOMHTMLCollection get_children ();-		[CCode (cname = "webkit_dom_html_element_get_class_list")]-		public unowned WebKit.DOMDOMTokenList get_class_list ();-		[CCode (cname = "webkit_dom_html_element_get_class_name")]-		public unowned string get_class_name ();-		[CCode (cname = "webkit_dom_html_element_get_content_editable")]-		public unowned string get_content_editable ();-		[CCode (cname = "webkit_dom_html_element_get_dir")]-		public unowned string get_dir ();-		[CCode (cname = "webkit_dom_html_element_get_draggable")]-		public bool get_draggable ();-		[CCode (cname = "webkit_dom_html_element_get_hidden")]-		public bool get_hidden ();-		[CCode (cname = "webkit_dom_html_element_get_id")]-		public unowned string get_id ();-		[CCode (cname = "webkit_dom_html_element_get_inner_html")]-		public unowned string get_inner_html ();-		[CCode (cname = "webkit_dom_html_element_get_inner_text")]-		public unowned string get_inner_text ();-		[CCode (cname = "webkit_dom_html_element_get_is_content_editable")]-		public bool get_is_content_editable ();-		[CCode (cname = "webkit_dom_html_element_get_lang")]-		public unowned string get_lang ();-		[CCode (cname = "webkit_dom_html_element_get_outer_html")]-		public unowned string get_outer_html ();-		[CCode (cname = "webkit_dom_html_element_get_outer_text")]-		public unowned string get_outer_text ();-		[CCode (cname = "webkit_dom_html_element_get_spellcheck")]-		public bool get_spellcheck ();-		[CCode (cname = "webkit_dom_html_element_get_tab_index")]-		public long get_tab_index ();-		[CCode (cname = "webkit_dom_html_element_get_title")]-		public unowned string get_title ();-		[CCode (cname = "webkit_dom_html_element_get_webkitdropzone")]-		public unowned string get_webkitdropzone ();-		[CCode (cname = "webkit_dom_html_element_insert_adjacent_element")]-		public unowned WebKit.DOMElement insert_adjacent_element (string where, WebKit.DOMElement element) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_element_insert_adjacent_html")]-		public void insert_adjacent_html (string where, string html) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_element_insert_adjacent_text")]-		public void insert_adjacent_text (string where, string text) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_element_set_class_name")]-		public void set_class_name (string value);-		[CCode (cname = "webkit_dom_html_element_set_content_editable")]-		public void set_content_editable (string value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_element_set_dir")]-		public void set_dir (string value);-		[CCode (cname = "webkit_dom_html_element_set_draggable")]-		public void set_draggable (bool value);-		[CCode (cname = "webkit_dom_html_element_set_hidden")]-		public void set_hidden (bool value);-		[CCode (cname = "webkit_dom_html_element_set_id")]-		public void set_id (string value);-		[CCode (cname = "webkit_dom_html_element_set_inner_html")]-		public void set_inner_html (string value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_element_set_inner_text")]-		public void set_inner_text (string value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_element_set_lang")]-		public void set_lang (string value);-		[CCode (cname = "webkit_dom_html_element_set_outer_html")]-		public void set_outer_html (string value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_element_set_outer_text")]-		public void set_outer_text (string value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_element_set_spellcheck")]-		public void set_spellcheck (bool value);-		[CCode (cname = "webkit_dom_html_element_set_tab_index")]-		public void set_tab_index (long value);-		[CCode (cname = "webkit_dom_html_element_set_title")]-		public void set_title (string value);-		[CCode (cname = "webkit_dom_html_element_set_webkitdropzone")]-		public void set_webkitdropzone (string value);-		public WebKit.DOMHTMLCollection children { get; }-		public WebKit.DOMDOMTokenList class_list { get; }-		public string class_name { get; set; }-		public string content_editable { get; set; }-		public string dir { get; set; }-		public bool draggable { get; set; }-		public bool hidden { get; set; }-		public string id { get; set; }-		public string inner_html { get; set; }-		public string inner_text { get; set; }-		public bool is_content_editable { get; }-		public string lang { get; set; }-		public string outer_html { get; set; }-		public string outer_text { get; set; }-		public bool spellcheck { get; set; }-		public long tab_index { get; set; }-		public string title { get; set; }-		public string webkitdropzone { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLEmbedElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLEmbedElement ();-		[CCode (cname = "webkit_dom_html_embed_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_embed_element_get_height")]-		public long get_height ();-		[CCode (cname = "webkit_dom_html_embed_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_embed_element_get_src")]-		public unowned string get_src ();-		[CCode (cname = "webkit_dom_html_embed_element_get_width")]-		public long get_width ();-		[CCode (cname = "webkit_dom_html_embed_element_set_align")]-		public void set_align (string value);-		[CCode (cname = "webkit_dom_html_embed_element_set_height")]-		public void set_height (long value);-		[CCode (cname = "webkit_dom_html_embed_element_set_name")]-		public void set_name (string value);-		[CCode (cname = "webkit_dom_html_embed_element_set_src")]-		public void set_src (string value);-		[CCode (cname = "webkit_dom_html_embed_element_set_width")]-		public void set_width (long value);-		public string align { get; set; }-		public long height { get; set; }-		public string name { get; set; }-		public string src { get; set; }-		[NoAccessorMethod]-		public string type { owned get; set; }-		public long width { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLFieldSetElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLFieldSetElement ();-		[CCode (cname = "webkit_dom_html_field_set_element_check_validity")]-		public bool check_validity ();-		[CCode (cname = "webkit_dom_html_field_set_element_get_form")]-		public unowned WebKit.DOMHTMLFormElement get_form ();-		[CCode (cname = "webkit_dom_html_field_set_element_get_validation_message")]-		public unowned string get_validation_message ();-		[CCode (cname = "webkit_dom_html_field_set_element_get_validity")]-		public unowned WebKit.DOMValidityState get_validity ();-		[CCode (cname = "webkit_dom_html_field_set_element_get_will_validate")]-		public bool get_will_validate ();-		[CCode (cname = "webkit_dom_html_field_set_element_set_custom_validity")]-		public void set_custom_validity (string error);-		public WebKit.DOMHTMLFormElement form { get; }-		public string validation_message { get; }-		public WebKit.DOMValidityState validity { get; }-		public bool will_validate { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLFontElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLFontElement ();-		[CCode (cname = "webkit_dom_html_font_element_get_color")]-		public unowned string get_color ();-		[CCode (cname = "webkit_dom_html_font_element_get_face")]-		public unowned string get_face ();-		[CCode (cname = "webkit_dom_html_font_element_get_size")]-		public unowned string get_size ();-		[CCode (cname = "webkit_dom_html_font_element_set_color")]-		public void set_color (string value);-		[CCode (cname = "webkit_dom_html_font_element_set_face")]-		public void set_face (string value);-		[CCode (cname = "webkit_dom_html_font_element_set_size")]-		public void set_size (string value);-		public string color { get; set; }-		public string face { get; set; }-		public string size { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLFormElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLFormElement ();-		[CCode (cname = "webkit_dom_html_form_element_check_validity")]-		public bool check_validity ();-		[CCode (cname = "webkit_dom_html_form_element_dispatch_form_change")]-		public void dispatch_form_change ();-		[CCode (cname = "webkit_dom_html_form_element_dispatch_form_input")]-		public void dispatch_form_input ();-		[CCode (cname = "webkit_dom_html_form_element_get_accept_charset")]-		public unowned string get_accept_charset ();-		[CCode (cname = "webkit_dom_html_form_element_get_action")]-		public unowned string get_action ();-		[CCode (cname = "webkit_dom_html_form_element_get_autocomplete")]-		public unowned string get_autocomplete ();-		[CCode (cname = "webkit_dom_html_form_element_get_elements")]-		public unowned WebKit.DOMHTMLCollection get_elements ();-		[CCode (cname = "webkit_dom_html_form_element_get_encoding")]-		public unowned string get_encoding ();-		[CCode (cname = "webkit_dom_html_form_element_get_enctype")]-		public unowned string get_enctype ();-		[CCode (cname = "webkit_dom_html_form_element_get_length")]-		public long get_length ();-		[CCode (cname = "webkit_dom_html_form_element_get_method")]-		public unowned string get_method ();-		[CCode (cname = "webkit_dom_html_form_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_form_element_get_no_validate")]-		public bool get_no_validate ();-		[CCode (cname = "webkit_dom_html_form_element_get_target")]-		public unowned string get_target ();-		[CCode (cname = "webkit_dom_html_form_element_reset")]-		public void reset ();-		[CCode (cname = "webkit_dom_html_form_element_set_accept_charset")]-		public void set_accept_charset (string value);-		[CCode (cname = "webkit_dom_html_form_element_set_action")]-		public void set_action (string value);-		[CCode (cname = "webkit_dom_html_form_element_set_autocomplete")]-		public void set_autocomplete (string value);-		[CCode (cname = "webkit_dom_html_form_element_set_encoding")]-		public void set_encoding (string value);-		[CCode (cname = "webkit_dom_html_form_element_set_enctype")]-		public void set_enctype (string value);-		[CCode (cname = "webkit_dom_html_form_element_set_method")]-		public void set_method (string value);-		[CCode (cname = "webkit_dom_html_form_element_set_name")]-		public void set_name (string value);-		[CCode (cname = "webkit_dom_html_form_element_set_no_validate")]-		public void set_no_validate (bool value);-		[CCode (cname = "webkit_dom_html_form_element_set_target")]-		public void set_target (string value);-		[CCode (cname = "webkit_dom_html_form_element_submit")]-		public void submit ();-		public string accept_charset { get; set; }-		public string action { get; set; }-		public string autocomplete { get; set; }-		public WebKit.DOMHTMLCollection elements { get; }-		public string encoding { get; set; }-		public string enctype { get; set; }-		public long length { get; }-		public string method { get; set; }-		public string name { get; set; }-		public bool no_validate { get; set; }-		public string target { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLFrameElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLFrameElement ();-		[CCode (cname = "webkit_dom_html_frame_element_get_content_document")]-		public unowned WebKit.DOMDocument get_content_document ();-		[CCode (cname = "webkit_dom_html_frame_element_get_content_window")]-		public unowned WebKit.DOMDOMWindow get_content_window ();-		[CCode (cname = "webkit_dom_html_frame_element_get_frame_border")]-		public unowned string get_frame_border ();-		[CCode (cname = "webkit_dom_html_frame_element_get_height")]-		public long get_height ();-		[CCode (cname = "webkit_dom_html_frame_element_get_long_desc")]-		public unowned string get_long_desc ();-		[CCode (cname = "webkit_dom_html_frame_element_get_margin_height")]-		public unowned string get_margin_height ();-		[CCode (cname = "webkit_dom_html_frame_element_get_margin_width")]-		public unowned string get_margin_width ();-		[CCode (cname = "webkit_dom_html_frame_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_frame_element_get_no_resize")]-		public bool get_no_resize ();-		[CCode (cname = "webkit_dom_html_frame_element_get_scrolling")]-		public unowned string get_scrolling ();-		[CCode (cname = "webkit_dom_html_frame_element_get_src")]-		public unowned string get_src ();-		[CCode (cname = "webkit_dom_html_frame_element_get_width")]-		public long get_width ();-		[CCode (cname = "webkit_dom_html_frame_element_set_frame_border")]-		public void set_frame_border (string value);-		[CCode (cname = "webkit_dom_html_frame_element_set_long_desc")]-		public void set_long_desc (string value);-		[CCode (cname = "webkit_dom_html_frame_element_set_margin_height")]-		public void set_margin_height (string value);-		[CCode (cname = "webkit_dom_html_frame_element_set_margin_width")]-		public void set_margin_width (string value);-		[CCode (cname = "webkit_dom_html_frame_element_set_name")]-		public void set_name (string value);-		[CCode (cname = "webkit_dom_html_frame_element_set_no_resize")]-		public void set_no_resize (bool value);-		[CCode (cname = "webkit_dom_html_frame_element_set_scrolling")]-		public void set_scrolling (string value);-		[CCode (cname = "webkit_dom_html_frame_element_set_src")]-		public void set_src (string value);-		public WebKit.DOMDocument content_document { get; }-		public WebKit.DOMDOMWindow content_window { get; }-		public string frame_border { get; set; }-		public long height { get; }-		public string long_desc { get; set; }-		public string margin_height { get; set; }-		public string margin_width { get; set; }-		public string name { get; set; }-		public bool no_resize { get; set; }-		public string scrolling { get; set; }-		public string src { get; set; }-		public long width { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLFrameSetElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLFrameSetElement ();-		[CCode (cname = "webkit_dom_html_frame_set_element_get_cols")]-		public unowned string get_cols ();-		[CCode (cname = "webkit_dom_html_frame_set_element_get_rows")]-		public unowned string get_rows ();-		[CCode (cname = "webkit_dom_html_frame_set_element_set_cols")]-		public void set_cols (string value);-		[CCode (cname = "webkit_dom_html_frame_set_element_set_rows")]-		public void set_rows (string value);-		public string cols { get; set; }-		public string rows { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLHRElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLHRElement ();-		[CCode (cname = "webkit_dom_htmlhr_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_htmlhr_element_get_no_shade")]-		public bool get_no_shade ();-		[CCode (cname = "webkit_dom_htmlhr_element_get_size")]-		public unowned string get_size ();-		[CCode (cname = "webkit_dom_htmlhr_element_get_width")]-		public unowned string get_width ();-		[CCode (cname = "webkit_dom_htmlhr_element_set_align")]-		public void set_align (string value);-		[CCode (cname = "webkit_dom_htmlhr_element_set_no_shade")]-		public void set_no_shade (bool value);-		[CCode (cname = "webkit_dom_htmlhr_element_set_size")]-		public void set_size (string value);-		[CCode (cname = "webkit_dom_htmlhr_element_set_width")]-		public void set_width (string value);-		public string align { get; set; }-		public bool no_shade { get; set; }-		public string size { get; set; }-		public string width { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLHeadElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLHeadElement ();-		[CCode (cname = "webkit_dom_html_head_element_get_profile")]-		public unowned string get_profile ();-		[CCode (cname = "webkit_dom_html_head_element_set_profile")]-		public void set_profile (string value);-		public string profile { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLHeadingElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLHeadingElement ();-		[CCode (cname = "webkit_dom_html_heading_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_heading_element_set_align")]-		public void set_align (string value);-		public string align { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLHtmlElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLHtmlElement ();-		[CCode (cname = "webkit_dom_html_html_element_get_manifest")]-		public unowned string get_manifest ();-		[CCode (cname = "webkit_dom_html_html_element_get_version")]-		public unowned string get_version ();-		[CCode (cname = "webkit_dom_html_html_element_set_manifest")]-		public void set_manifest (string value);-		[CCode (cname = "webkit_dom_html_html_element_set_version")]-		public void set_version (string value);-		public string manifest { get; set; }-		public string version { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLIFrameElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLIFrameElement ();-		[CCode (cname = "webkit_dom_html_iframe_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_iframe_element_get_content_document")]-		public unowned WebKit.DOMDocument get_content_document ();-		[CCode (cname = "webkit_dom_html_iframe_element_get_content_window")]-		public unowned WebKit.DOMDOMWindow get_content_window ();-		[CCode (cname = "webkit_dom_html_iframe_element_get_frame_border")]-		public unowned string get_frame_border ();-		[CCode (cname = "webkit_dom_html_iframe_element_get_height")]-		public unowned string get_height ();-		[CCode (cname = "webkit_dom_html_iframe_element_get_long_desc")]-		public unowned string get_long_desc ();-		[CCode (cname = "webkit_dom_html_iframe_element_get_margin_height")]-		public unowned string get_margin_height ();-		[CCode (cname = "webkit_dom_html_iframe_element_get_margin_width")]-		public unowned string get_margin_width ();-		[CCode (cname = "webkit_dom_html_iframe_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_iframe_element_get_sandbox")]-		public unowned string get_sandbox ();-		[CCode (cname = "webkit_dom_html_iframe_element_get_scrolling")]-		public unowned string get_scrolling ();-		[CCode (cname = "webkit_dom_html_iframe_element_get_src")]-		public unowned string get_src ();-		[CCode (cname = "webkit_dom_html_iframe_element_get_width")]-		public unowned string get_width ();-		[CCode (cname = "webkit_dom_html_iframe_element_set_align")]-		public void set_align (string value);-		[CCode (cname = "webkit_dom_html_iframe_element_set_frame_border")]-		public void set_frame_border (string value);-		[CCode (cname = "webkit_dom_html_iframe_element_set_height")]-		public void set_height (string value);-		[CCode (cname = "webkit_dom_html_iframe_element_set_long_desc")]-		public void set_long_desc (string value);-		[CCode (cname = "webkit_dom_html_iframe_element_set_margin_height")]-		public void set_margin_height (string value);-		[CCode (cname = "webkit_dom_html_iframe_element_set_margin_width")]-		public void set_margin_width (string value);-		[CCode (cname = "webkit_dom_html_iframe_element_set_name")]-		public void set_name (string value);-		[CCode (cname = "webkit_dom_html_iframe_element_set_sandbox")]-		public void set_sandbox (string value);-		[CCode (cname = "webkit_dom_html_iframe_element_set_scrolling")]-		public void set_scrolling (string value);-		[CCode (cname = "webkit_dom_html_iframe_element_set_src")]-		public void set_src (string value);-		[CCode (cname = "webkit_dom_html_iframe_element_set_width")]-		public void set_width (string value);-		public string align { get; set; }-		public WebKit.DOMDocument content_document { get; }-		public WebKit.DOMDOMWindow content_window { get; }-		public string frame_border { get; set; }-		public string height { get; set; }-		public string long_desc { get; set; }-		public string margin_height { get; set; }-		public string margin_width { get; set; }-		public string name { get; set; }-		public string sandbox { get; set; }-		public string scrolling { get; set; }-		public string src { get; set; }-		public string width { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLImageElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLImageElement ();-		[CCode (cname = "webkit_dom_html_image_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_image_element_get_alt")]-		public unowned string get_alt ();-		[CCode (cname = "webkit_dom_html_image_element_get_border")]-		public unowned string get_border ();-		[CCode (cname = "webkit_dom_html_image_element_get_complete")]-		public bool get_complete ();-		[CCode (cname = "webkit_dom_html_image_element_get_cross_origin")]-		public unowned string get_cross_origin ();-		[CCode (cname = "webkit_dom_html_image_element_get_height")]-		public long get_height ();-		[CCode (cname = "webkit_dom_html_image_element_get_hspace")]-		public long get_hspace ();-		[CCode (cname = "webkit_dom_html_image_element_get_is_map")]-		public bool get_is_map ();-		[CCode (cname = "webkit_dom_html_image_element_get_long_desc")]-		public unowned string get_long_desc ();-		[CCode (cname = "webkit_dom_html_image_element_get_lowsrc")]-		public unowned string get_lowsrc ();-		[CCode (cname = "webkit_dom_html_image_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_image_element_get_natural_height")]-		public long get_natural_height ();-		[CCode (cname = "webkit_dom_html_image_element_get_natural_width")]-		public long get_natural_width ();-		[CCode (cname = "webkit_dom_html_image_element_get_src")]-		public unowned string get_src ();-		[CCode (cname = "webkit_dom_html_image_element_get_use_map")]-		public unowned string get_use_map ();-		[CCode (cname = "webkit_dom_html_image_element_get_vspace")]-		public long get_vspace ();-		[CCode (cname = "webkit_dom_html_image_element_get_width")]-		public long get_width ();-		[CCode (cname = "webkit_dom_html_image_element_get_x")]-		public long get_x ();-		[CCode (cname = "webkit_dom_html_image_element_get_y")]-		public long get_y ();-		[CCode (cname = "webkit_dom_html_image_element_set_align")]-		public void set_align (string value);-		[CCode (cname = "webkit_dom_html_image_element_set_alt")]-		public void set_alt (string value);-		[CCode (cname = "webkit_dom_html_image_element_set_border")]-		public void set_border (string value);-		[CCode (cname = "webkit_dom_html_image_element_set_cross_origin")]-		public void set_cross_origin (string value);-		[CCode (cname = "webkit_dom_html_image_element_set_height")]-		public void set_height (long value);-		[CCode (cname = "webkit_dom_html_image_element_set_hspace")]-		public void set_hspace (long value);-		[CCode (cname = "webkit_dom_html_image_element_set_is_map")]-		public void set_is_map (bool value);-		[CCode (cname = "webkit_dom_html_image_element_set_long_desc")]-		public void set_long_desc (string value);-		[CCode (cname = "webkit_dom_html_image_element_set_lowsrc")]-		public void set_lowsrc (string value);-		[CCode (cname = "webkit_dom_html_image_element_set_name")]-		public void set_name (string value);-		[CCode (cname = "webkit_dom_html_image_element_set_src")]-		public void set_src (string value);-		[CCode (cname = "webkit_dom_html_image_element_set_use_map")]-		public void set_use_map (string value);-		[CCode (cname = "webkit_dom_html_image_element_set_vspace")]-		public void set_vspace (long value);-		[CCode (cname = "webkit_dom_html_image_element_set_width")]-		public void set_width (long value);-		public string align { get; set; }-		public string alt { get; set; }-		public string border { get; set; }-		public bool complete { get; }-		public string cross_origin { get; set; }-		public long height { get; set; }-		public long hspace { get; set; }-		public bool is_map { get; set; }-		public string long_desc { get; set; }-		public string lowsrc { get; set; }-		public string name { get; set; }-		public long natural_height { get; }-		public long natural_width { get; }-		public string src { get; set; }-		public string use_map { get; set; }-		public long vspace { get; set; }-		public long width { get; set; }-		public long x { get; }-		public long y { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLInputElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLInputElement ();-		[CCode (cname = "webkit_dom_html_input_element_check_validity")]-		public bool check_validity ();-		[CCode (cname = "webkit_dom_html_input_element_click")]-		public void click ();-		[CCode (cname = "webkit_dom_html_input_element_get_accept")]-		public unowned string get_accept ();-		[CCode (cname = "webkit_dom_html_input_element_get_access_key")]-		public unowned string get_access_key ();-		[CCode (cname = "webkit_dom_html_input_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_input_element_get_alt")]-		public unowned string get_alt ();-		[CCode (cname = "webkit_dom_html_input_element_get_autocomplete")]-		public unowned string get_autocomplete ();-		[CCode (cname = "webkit_dom_html_input_element_get_autofocus")]-		public bool get_autofocus ();-		[CCode (cname = "webkit_dom_html_input_element_get_checked")]-		public bool get_checked ();-		[CCode (cname = "webkit_dom_html_input_element_get_default_checked")]-		public bool get_default_checked ();-		[CCode (cname = "webkit_dom_html_input_element_get_default_value")]-		public unowned string get_default_value ();-		[CCode (cname = "webkit_dom_html_input_element_get_disabled")]-		public bool get_disabled ();-		[CCode (cname = "webkit_dom_html_input_element_get_files")]-		public unowned WebKit.DOMFileList get_files ();-		[CCode (cname = "webkit_dom_html_input_element_get_form")]-		public unowned WebKit.DOMHTMLFormElement get_form ();-		[CCode (cname = "webkit_dom_html_input_element_get_form_action")]-		public unowned string get_form_action ();-		[CCode (cname = "webkit_dom_html_input_element_get_form_enctype")]-		public unowned string get_form_enctype ();-		[CCode (cname = "webkit_dom_html_input_element_get_form_method")]-		public unowned string get_form_method ();-		[CCode (cname = "webkit_dom_html_input_element_get_form_no_validate")]-		public bool get_form_no_validate ();-		[CCode (cname = "webkit_dom_html_input_element_get_form_target")]-		public unowned string get_form_target ();-		[CCode (cname = "webkit_dom_html_input_element_get_incremental")]-		public bool get_incremental ();-		[CCode (cname = "webkit_dom_html_input_element_get_indeterminate")]-		public bool get_indeterminate ();-		[CCode (cname = "webkit_dom_html_input_element_get_labels")]-		public unowned WebKit.DOMNodeList get_labels ();-		[CCode (cname = "webkit_dom_html_input_element_get_list")]-		public unowned WebKit.DOMHTMLElement get_list ();-		[CCode (cname = "webkit_dom_html_input_element_get_max")]-		public unowned string get_max ();-		[CCode (cname = "webkit_dom_html_input_element_get_max_length")]-		public long get_max_length ();-		[CCode (cname = "webkit_dom_html_input_element_get_min")]-		public unowned string get_min ();-		[CCode (cname = "webkit_dom_html_input_element_get_multiple")]-		public bool get_multiple ();-		[CCode (cname = "webkit_dom_html_input_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_input_element_get_pattern")]-		public unowned string get_pattern ();-		[CCode (cname = "webkit_dom_html_input_element_get_placeholder")]-		public unowned string get_placeholder ();-		[CCode (cname = "webkit_dom_html_input_element_get_read_only")]-		public bool get_read_only ();-		[CCode (cname = "webkit_dom_html_input_element_get_required")]-		public bool get_required ();-		[CCode (cname = "webkit_dom_html_input_element_get_selected_option")]-		public unowned WebKit.DOMHTMLOptionElement get_selected_option ();-		[CCode (cname = "webkit_dom_html_input_element_get_size")]-		public ulong get_size ();-		[CCode (cname = "webkit_dom_html_input_element_get_src")]-		public unowned string get_src ();-		[CCode (cname = "webkit_dom_html_input_element_get_step")]-		public unowned string get_step ();-		[CCode (cname = "webkit_dom_html_input_element_get_use_map")]-		public unowned string get_use_map ();-		[CCode (cname = "webkit_dom_html_input_element_get_validation_message")]-		public unowned string get_validation_message ();-		[CCode (cname = "webkit_dom_html_input_element_get_validity")]-		public unowned WebKit.DOMValidityState get_validity ();-		[CCode (cname = "webkit_dom_html_input_element_get_value")]-		public unowned string get_value ();-		[CCode (cname = "webkit_dom_html_input_element_get_value_as_number")]-		public double get_value_as_number ();-		[CCode (cname = "webkit_dom_html_input_element_get_webkit_grammar")]-		public bool get_webkit_grammar ();-		[CCode (cname = "webkit_dom_html_input_element_get_webkit_speech")]-		public bool get_webkit_speech ();-		[CCode (cname = "webkit_dom_html_input_element_get_webkitdirectory")]-		public bool get_webkitdirectory ();-		[CCode (cname = "webkit_dom_html_input_element_get_will_validate")]-		public bool get_will_validate ();-		[CCode (cname = "webkit_dom_html_input_element_is_edited")]-		public bool is_edited ();-		[CCode (cname = "webkit_dom_html_input_element_select")]-		public void select ();-		[CCode (cname = "webkit_dom_html_input_element_set_accept")]-		public void set_accept (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_access_key")]-		public void set_access_key (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_align")]-		public void set_align (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_alt")]-		public void set_alt (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_autocomplete")]-		public void set_autocomplete (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_autofocus")]-		public void set_autofocus (bool value);-		[CCode (cname = "webkit_dom_html_input_element_set_checked")]-		public void set_checked (bool value);-		[CCode (cname = "webkit_dom_html_input_element_set_custom_validity")]-		public void set_custom_validity (string error);-		[CCode (cname = "webkit_dom_html_input_element_set_default_checked")]-		public void set_default_checked (bool value);-		[CCode (cname = "webkit_dom_html_input_element_set_default_value")]-		public void set_default_value (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_disabled")]-		public void set_disabled (bool value);-		[CCode (cname = "webkit_dom_html_input_element_set_form_action")]-		public void set_form_action (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_form_enctype")]-		public void set_form_enctype (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_form_method")]-		public void set_form_method (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_form_no_validate")]-		public void set_form_no_validate (bool value);-		[CCode (cname = "webkit_dom_html_input_element_set_form_target")]-		public void set_form_target (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_incremental")]-		public void set_incremental (bool value);-		[CCode (cname = "webkit_dom_html_input_element_set_indeterminate")]-		public void set_indeterminate (bool value);-		[CCode (cname = "webkit_dom_html_input_element_set_max")]-		public void set_max (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_max_length")]-		public void set_max_length (long value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_input_element_set_min")]-		public void set_min (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_multiple")]-		public void set_multiple (bool value);-		[CCode (cname = "webkit_dom_html_input_element_set_name")]-		public void set_name (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_pattern")]-		public void set_pattern (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_placeholder")]-		public void set_placeholder (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_read_only")]-		public void set_read_only (bool value);-		[CCode (cname = "webkit_dom_html_input_element_set_required")]-		public void set_required (bool value);-		[CCode (cname = "webkit_dom_html_input_element_set_size")]-		public void set_size (ulong value);-		[CCode (cname = "webkit_dom_html_input_element_set_src")]-		public void set_src (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_step")]-		public void set_step (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_use_map")]-		public void set_use_map (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_value")]-		public void set_value (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_value_as_number")]-		public void set_value_as_number (double value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_input_element_set_value_for_user")]-		public void set_value_for_user (string value);-		[CCode (cname = "webkit_dom_html_input_element_set_webkit_grammar")]-		public void set_webkit_grammar (bool value);-		[CCode (cname = "webkit_dom_html_input_element_set_webkit_speech")]-		public void set_webkit_speech (bool value);-		[CCode (cname = "webkit_dom_html_input_element_set_webkitdirectory")]-		public void set_webkitdirectory (bool value);-		[CCode (cname = "webkit_dom_html_input_element_step_down")]-		public void step_down (long n) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_input_element_step_up")]-		public void step_up (long n) throws GLib.Error;-		public string accept { get; set; }-		public string access_key { get; set; }-		public string align { get; set; }-		public string alt { get; set; }-		public string autocomplete { get; set; }-		public bool autofocus { get; set; }-		public bool checked { get; set; }-		public bool default_checked { get; set; }-		public string default_value { get; set; }-		public bool disabled { get; set; }-		public WebKit.DOMFileList files { get; }-		public WebKit.DOMHTMLFormElement form { get; }-		public string form_action { get; set; }-		public string form_enctype { get; set; }-		public string form_method { get; set; }-		public bool form_no_validate { get; set; }-		public string form_target { get; set; }-		public bool incremental { get; set; }-		public bool indeterminate { get; set; }-		public WebKit.DOMNodeList labels { get; }-		public WebKit.DOMHTMLElement list { get; }-		public string max { get; set; }-		public long max_length { get; set; }-		public string min { get; set; }-		public bool multiple { get; set; }-		public string name { get; set; }-		public string pattern { get; set; }-		public string placeholder { get; set; }-		public bool read_only { get; set; }-		public bool required { get; set; }-		public WebKit.DOMHTMLOptionElement selected_option { get; }-		public ulong size { get; set; }-		public string src { get; set; }-		public string step { get; set; }-		[NoAccessorMethod]-		public string type { owned get; set; }-		public string use_map { get; set; }-		public string validation_message { get; }-		public WebKit.DOMValidityState validity { get; }-		public string value { get; set; }-		public double value_as_number { get; set; }-		public bool will_validate { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLIsIndexElement : WebKit.DOMHTMLInputElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLIsIndexElement ();-		[CCode (cname = "webkit_dom_html_is_index_element_get_form")]-		public unowned WebKit.DOMHTMLFormElement get_form ();-		[CCode (cname = "webkit_dom_html_is_index_element_get_prompt")]-		public unowned string get_prompt ();-		[CCode (cname = "webkit_dom_html_is_index_element_set_prompt")]-		public void set_prompt (string value);-		public WebKit.DOMHTMLFormElement form { get; }-		public string prompt { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLKeygenElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLKeygenElement ();-		[CCode (cname = "webkit_dom_html_keygen_element_check_validity")]-		public bool check_validity ();-		[CCode (cname = "webkit_dom_html_keygen_element_get_autofocus")]-		public bool get_autofocus ();-		[CCode (cname = "webkit_dom_html_keygen_element_get_challenge")]-		public unowned string get_challenge ();-		[CCode (cname = "webkit_dom_html_keygen_element_get_disabled")]-		public bool get_disabled ();-		[CCode (cname = "webkit_dom_html_keygen_element_get_form")]-		public unowned WebKit.DOMHTMLFormElement get_form ();-		[CCode (cname = "webkit_dom_html_keygen_element_get_keytype")]-		public unowned string get_keytype ();-		[CCode (cname = "webkit_dom_html_keygen_element_get_labels")]-		public unowned WebKit.DOMNodeList get_labels ();-		[CCode (cname = "webkit_dom_html_keygen_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_keygen_element_get_validation_message")]-		public unowned string get_validation_message ();-		[CCode (cname = "webkit_dom_html_keygen_element_get_validity")]-		public unowned WebKit.DOMValidityState get_validity ();-		[CCode (cname = "webkit_dom_html_keygen_element_get_will_validate")]-		public bool get_will_validate ();-		[CCode (cname = "webkit_dom_html_keygen_element_set_autofocus")]-		public void set_autofocus (bool value);-		[CCode (cname = "webkit_dom_html_keygen_element_set_challenge")]-		public void set_challenge (string value);-		[CCode (cname = "webkit_dom_html_keygen_element_set_custom_validity")]-		public void set_custom_validity (string error);-		[CCode (cname = "webkit_dom_html_keygen_element_set_disabled")]-		public void set_disabled (bool value);-		[CCode (cname = "webkit_dom_html_keygen_element_set_keytype")]-		public void set_keytype (string value);-		[CCode (cname = "webkit_dom_html_keygen_element_set_name")]-		public void set_name (string value);-		public bool autofocus { get; set; }-		public string challenge { get; set; }-		public bool disabled { get; set; }-		public WebKit.DOMHTMLFormElement form { get; }-		public string keytype { get; set; }-		public WebKit.DOMNodeList labels { get; }-		public string name { get; set; }-		[NoAccessorMethod]-		public string type { owned get; }-		public string validation_message { get; }-		public WebKit.DOMValidityState validity { get; }-		public bool will_validate { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLLIElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLLIElement ();-		[CCode (cname = "webkit_dom_htmlli_element_get_value")]-		public long get_value ();-		[CCode (cname = "webkit_dom_htmlli_element_set_value")]-		public void set_value (long value);-		[NoAccessorMethod]-		public string type { owned get; set; }-		public long value { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLLabelElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLLabelElement ();-		[CCode (cname = "webkit_dom_html_label_element_get_access_key")]-		public unowned string get_access_key ();-		[CCode (cname = "webkit_dom_html_label_element_get_control")]-		public unowned WebKit.DOMHTMLElement get_control ();-		[CCode (cname = "webkit_dom_html_label_element_get_form")]-		public unowned WebKit.DOMHTMLFormElement get_form ();-		[CCode (cname = "webkit_dom_html_label_element_get_html_for")]-		public unowned string get_html_for ();-		[CCode (cname = "webkit_dom_html_label_element_set_access_key")]-		public void set_access_key (string value);-		[CCode (cname = "webkit_dom_html_label_element_set_html_for")]-		public void set_html_for (string value);-		public string access_key { get; set; }-		public WebKit.DOMHTMLElement control { get; }-		public WebKit.DOMHTMLFormElement form { get; }-		public string html_for { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLLegendElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLLegendElement ();-		[CCode (cname = "webkit_dom_html_legend_element_get_access_key")]-		public unowned string get_access_key ();-		[CCode (cname = "webkit_dom_html_legend_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_legend_element_get_form")]-		public unowned WebKit.DOMHTMLFormElement get_form ();-		[CCode (cname = "webkit_dom_html_legend_element_set_access_key")]-		public void set_access_key (string value);-		[CCode (cname = "webkit_dom_html_legend_element_set_align")]-		public void set_align (string value);-		public string access_key { get; set; }-		public string align { get; set; }-		public WebKit.DOMHTMLFormElement form { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLLinkElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLLinkElement ();-		[CCode (cname = "webkit_dom_html_link_element_get_charset")]-		public unowned string get_charset ();-		[CCode (cname = "webkit_dom_html_link_element_get_disabled")]-		public bool get_disabled ();-		[CCode (cname = "webkit_dom_html_link_element_get_href")]-		public unowned string get_href ();-		[CCode (cname = "webkit_dom_html_link_element_get_hreflang")]-		public unowned string get_hreflang ();-		[CCode (cname = "webkit_dom_html_link_element_get_media")]-		public unowned string get_media ();-		[CCode (cname = "webkit_dom_html_link_element_get_rel")]-		public unowned string get_rel ();-		[CCode (cname = "webkit_dom_html_link_element_get_rev")]-		public unowned string get_rev ();-		[CCode (cname = "webkit_dom_html_link_element_get_sheet")]-		public unowned WebKit.DOMStyleSheet get_sheet ();-		[CCode (cname = "webkit_dom_html_link_element_get_target")]-		public unowned string get_target ();-		[CCode (cname = "webkit_dom_html_link_element_set_charset")]-		public void set_charset (string value);-		[CCode (cname = "webkit_dom_html_link_element_set_disabled")]-		public void set_disabled (bool value);-		[CCode (cname = "webkit_dom_html_link_element_set_href")]-		public void set_href (string value);-		[CCode (cname = "webkit_dom_html_link_element_set_hreflang")]-		public void set_hreflang (string value);-		[CCode (cname = "webkit_dom_html_link_element_set_media")]-		public void set_media (string value);-		[CCode (cname = "webkit_dom_html_link_element_set_rel")]-		public void set_rel (string value);-		[CCode (cname = "webkit_dom_html_link_element_set_rev")]-		public void set_rev (string value);-		[CCode (cname = "webkit_dom_html_link_element_set_target")]-		public void set_target (string value);-		public string charset { get; set; }-		public bool disabled { get; set; }-		public string href { get; set; }-		public string hreflang { get; set; }-		public string media { get; set; }-		public string rel { get; set; }-		public string rev { get; set; }-		public WebKit.DOMStyleSheet sheet { get; }-		public string target { get; set; }-		[NoAccessorMethod]-		public string type { owned get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLMapElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLMapElement ();-		[CCode (cname = "webkit_dom_html_map_element_get_areas")]-		public unowned WebKit.DOMHTMLCollection get_areas ();-		[CCode (cname = "webkit_dom_html_map_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_map_element_set_name")]-		public void set_name (string value);-		public WebKit.DOMHTMLCollection areas { get; }-		public string name { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLMarqueeElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLMarqueeElement ();-		[CCode (cname = "webkit_dom_html_marquee_element_get_behavior")]-		public unowned string get_behavior ();-		[CCode (cname = "webkit_dom_html_marquee_element_get_bg_color")]-		public unowned string get_bg_color ();-		[CCode (cname = "webkit_dom_html_marquee_element_get_direction")]-		public unowned string get_direction ();-		[CCode (cname = "webkit_dom_html_marquee_element_get_height")]-		public unowned string get_height ();-		[CCode (cname = "webkit_dom_html_marquee_element_get_hspace")]-		public ulong get_hspace ();-		[CCode (cname = "webkit_dom_html_marquee_element_get_loop")]-		public long get_loop ();-		[CCode (cname = "webkit_dom_html_marquee_element_get_scroll_amount")]-		public long get_scroll_amount ();-		[CCode (cname = "webkit_dom_html_marquee_element_get_scroll_delay")]-		public long get_scroll_delay ();-		[CCode (cname = "webkit_dom_html_marquee_element_get_true_speed")]-		public bool get_true_speed ();-		[CCode (cname = "webkit_dom_html_marquee_element_get_vspace")]-		public ulong get_vspace ();-		[CCode (cname = "webkit_dom_html_marquee_element_get_width")]-		public unowned string get_width ();-		[CCode (cname = "webkit_dom_html_marquee_element_set_behavior")]-		public void set_behavior (string value);-		[CCode (cname = "webkit_dom_html_marquee_element_set_bg_color")]-		public void set_bg_color (string value);-		[CCode (cname = "webkit_dom_html_marquee_element_set_direction")]-		public void set_direction (string value);-		[CCode (cname = "webkit_dom_html_marquee_element_set_height")]-		public void set_height (string value);-		[CCode (cname = "webkit_dom_html_marquee_element_set_hspace")]-		public void set_hspace (ulong value);-		[CCode (cname = "webkit_dom_html_marquee_element_set_loop")]-		public void set_loop (long value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_marquee_element_set_scroll_amount")]-		public void set_scroll_amount (long value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_marquee_element_set_scroll_delay")]-		public void set_scroll_delay (long value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_marquee_element_set_true_speed")]-		public void set_true_speed (bool value);-		[CCode (cname = "webkit_dom_html_marquee_element_set_vspace")]-		public void set_vspace (ulong value);-		[CCode (cname = "webkit_dom_html_marquee_element_set_width")]-		public void set_width (string value);-		[CCode (cname = "webkit_dom_html_marquee_element_start")]-		public void start ();-		[CCode (cname = "webkit_dom_html_marquee_element_stop")]-		public void stop ();-		public string behavior { get; set; }-		public string bg_color { get; set; }-		public string direction { get; set; }-		public string height { get; set; }-		public ulong hspace { get; set; }-		public long loop { get; set; }-		public long scroll_amount { get; set; }-		public long scroll_delay { get; set; }-		public bool true_speed { get; set; }-		public ulong vspace { get; set; }-		public string width { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLMediaElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLMediaElement ();-		[CCode (cname = "webkit_dom_html_media_element_can_play_type")]-		public unowned string can_play_type (string type);-		[CCode (cname = "webkit_dom_html_media_element_get_autoplay")]-		public bool get_autoplay ();-		[CCode (cname = "webkit_dom_html_media_element_get_buffered")]-		public unowned WebKit.DOMTimeRanges get_buffered ();-		[CCode (cname = "webkit_dom_html_media_element_get_controls")]-		public bool get_controls ();-		[CCode (cname = "webkit_dom_html_media_element_get_current_src")]-		public unowned string get_current_src ();-		[CCode (cname = "webkit_dom_html_media_element_get_current_time")]-		public float get_current_time ();-		[CCode (cname = "webkit_dom_html_media_element_get_default_muted")]-		public bool get_default_muted ();-		[CCode (cname = "webkit_dom_html_media_element_get_default_playback_rate")]-		public float get_default_playback_rate ();-		[CCode (cname = "webkit_dom_html_media_element_get_duration")]-		public float get_duration ();-		[CCode (cname = "webkit_dom_html_media_element_get_ended")]-		public bool get_ended ();-		[CCode (cname = "webkit_dom_html_media_element_get_error")]-		public unowned WebKit.DOMMediaError get_error ();-		[CCode (cname = "webkit_dom_html_media_element_get_initial_time")]-		public double get_initial_time ();-		[CCode (cname = "webkit_dom_html_media_element_get_loop")]-		public bool get_loop ();-		[CCode (cname = "webkit_dom_html_media_element_get_muted")]-		public bool get_muted ();-		[CCode (cname = "webkit_dom_html_media_element_get_network_state")]-		public ushort get_network_state ();-		[CCode (cname = "webkit_dom_html_media_element_get_paused")]-		public bool get_paused ();-		[CCode (cname = "webkit_dom_html_media_element_get_playback_rate")]-		public float get_playback_rate ();-		[CCode (cname = "webkit_dom_html_media_element_get_played")]-		public unowned WebKit.DOMTimeRanges get_played ();-		[CCode (cname = "webkit_dom_html_media_element_get_preload")]-		public unowned string get_preload ();-		[CCode (cname = "webkit_dom_html_media_element_get_ready_state")]-		public ushort get_ready_state ();-		[CCode (cname = "webkit_dom_html_media_element_get_seekable")]-		public unowned WebKit.DOMTimeRanges get_seekable ();-		[CCode (cname = "webkit_dom_html_media_element_get_seeking")]-		public bool get_seeking ();-		[CCode (cname = "webkit_dom_html_media_element_get_src")]-		public unowned string get_src ();-		[CCode (cname = "webkit_dom_html_media_element_get_start_time")]-		public float get_start_time ();-		[CCode (cname = "webkit_dom_html_media_element_get_volume")]-		public float get_volume ();-		[CCode (cname = "webkit_dom_html_media_element_get_webkit_audio_decoded_byte_count")]-		public ulong get_webkit_audio_decoded_byte_count ();-		[CCode (cname = "webkit_dom_html_media_element_get_webkit_closed_captions_visible")]-		public bool get_webkit_closed_captions_visible ();-		[CCode (cname = "webkit_dom_html_media_element_get_webkit_has_closed_captions")]-		public bool get_webkit_has_closed_captions ();-		[CCode (cname = "webkit_dom_html_media_element_get_webkit_preserves_pitch")]-		public bool get_webkit_preserves_pitch ();-		[CCode (cname = "webkit_dom_html_media_element_get_webkit_video_decoded_byte_count")]-		public ulong get_webkit_video_decoded_byte_count ();-		[CCode (cname = "webkit_dom_html_media_element_load")]-		public void load () throws GLib.Error;-		[CCode (cname = "webkit_dom_html_media_element_pause")]-		public void pause ();-		[CCode (cname = "webkit_dom_html_media_element_play")]-		public void play ();-		[CCode (cname = "webkit_dom_html_media_element_set_autoplay")]-		public void set_autoplay (bool value);-		[CCode (cname = "webkit_dom_html_media_element_set_controls")]-		public void set_controls (bool value);-		[CCode (cname = "webkit_dom_html_media_element_set_current_time")]-		public void set_current_time (float value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_media_element_set_default_muted")]-		public void set_default_muted (bool value);-		[CCode (cname = "webkit_dom_html_media_element_set_default_playback_rate")]-		public void set_default_playback_rate (float value);-		[CCode (cname = "webkit_dom_html_media_element_set_loop")]-		public void set_loop (bool value);-		[CCode (cname = "webkit_dom_html_media_element_set_muted")]-		public void set_muted (bool value);-		[CCode (cname = "webkit_dom_html_media_element_set_playback_rate")]-		public void set_playback_rate (float value);-		[CCode (cname = "webkit_dom_html_media_element_set_preload")]-		public void set_preload (string value);-		[CCode (cname = "webkit_dom_html_media_element_set_src")]-		public void set_src (string value);-		[CCode (cname = "webkit_dom_html_media_element_set_volume")]-		public void set_volume (float value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_media_element_set_webkit_closed_captions_visible")]-		public void set_webkit_closed_captions_visible (bool value);-		[CCode (cname = "webkit_dom_html_media_element_set_webkit_preserves_pitch")]-		public void set_webkit_preserves_pitch (bool value);-		public bool autoplay { get; set; }-		public WebKit.DOMTimeRanges buffered { get; }-		public bool controls { get; set; }-		public string current_src { get; }-		public float current_time { get; set; }-		public bool default_muted { get; set; }-		public float default_playback_rate { get; set; }-		public float duration { get; }-		public bool ended { get; }-		public WebKit.DOMMediaError error { get; }-		public double initial_time { get; }-		public bool loop { get; set; }-		public bool muted { get; set; }-		public uint network_state { get; }-		public bool paused { get; }-		public float playback_rate { get; set; }-		public WebKit.DOMTimeRanges played { get; }-		public string preload { get; set; }-		public uint ready_state { get; }-		public WebKit.DOMTimeRanges seekable { get; }-		public bool seeking { get; }-		public string src { get; set; }-		public float start_time { get; }-		public float volume { get; set; }-		public bool webkit_closed_captions_visible { get; set; }-		public bool webkit_has_closed_captions { get; }-		public bool webkit_preserves_pitch { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLMenuElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLMenuElement ();-		[CCode (cname = "webkit_dom_html_menu_element_get_compact")]-		public bool get_compact ();-		[CCode (cname = "webkit_dom_html_menu_element_set_compact")]-		public void set_compact (bool value);-		public bool compact { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLMetaElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLMetaElement ();-		[CCode (cname = "webkit_dom_html_meta_element_get_content")]-		public unowned string get_content ();-		[CCode (cname = "webkit_dom_html_meta_element_get_http_equiv")]-		public unowned string get_http_equiv ();-		[CCode (cname = "webkit_dom_html_meta_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_meta_element_get_scheme")]-		public unowned string get_scheme ();-		[CCode (cname = "webkit_dom_html_meta_element_set_content")]-		public void set_content (string value);-		[CCode (cname = "webkit_dom_html_meta_element_set_http_equiv")]-		public void set_http_equiv (string value);-		[CCode (cname = "webkit_dom_html_meta_element_set_name")]-		public void set_name (string value);-		[CCode (cname = "webkit_dom_html_meta_element_set_scheme")]-		public void set_scheme (string value);-		public string content { get; set; }-		public string http_equiv { get; set; }-		public string name { get; set; }-		public string scheme { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLModElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLModElement ();-		[CCode (cname = "webkit_dom_html_mod_element_get_cite")]-		public unowned string get_cite ();-		[CCode (cname = "webkit_dom_html_mod_element_get_date_time")]-		public unowned string get_date_time ();-		[CCode (cname = "webkit_dom_html_mod_element_set_cite")]-		public void set_cite (string value);-		[CCode (cname = "webkit_dom_html_mod_element_set_date_time")]-		public void set_date_time (string value);-		public string cite { get; set; }-		public string date_time { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLOListElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLOListElement ();-		[CCode (cname = "webkit_dom_htmlo_list_element_get_compact")]-		public bool get_compact ();-		[CCode (cname = "webkit_dom_htmlo_list_element_get_start")]-		public long get_start ();-		[CCode (cname = "webkit_dom_htmlo_list_element_set_compact")]-		public void set_compact (bool value);-		[CCode (cname = "webkit_dom_htmlo_list_element_set_start")]-		public void set_start (long value);-		public bool compact { get; set; }-		public long start { get; set; }-		[NoAccessorMethod]-		public string type { owned get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLObjectElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLObjectElement ();-		[CCode (cname = "webkit_dom_html_object_element_check_validity")]-		public bool check_validity ();-		[CCode (cname = "webkit_dom_html_object_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_object_element_get_archive")]-		public unowned string get_archive ();-		[CCode (cname = "webkit_dom_html_object_element_get_border")]-		public unowned string get_border ();-		[CCode (cname = "webkit_dom_html_object_element_get_code")]-		public unowned string get_code ();-		[CCode (cname = "webkit_dom_html_object_element_get_code_base")]-		public unowned string get_code_base ();-		[CCode (cname = "webkit_dom_html_object_element_get_code_type")]-		public unowned string get_code_type ();-		[CCode (cname = "webkit_dom_html_object_element_get_content_document")]-		public unowned WebKit.DOMDocument get_content_document ();-		[CCode (cname = "webkit_dom_html_object_element_get_data")]-		public unowned string get_data ();-		[CCode (cname = "webkit_dom_html_object_element_get_declare")]-		public bool get_declare ();-		[CCode (cname = "webkit_dom_html_object_element_get_form")]-		public unowned WebKit.DOMHTMLFormElement get_form ();-		[CCode (cname = "webkit_dom_html_object_element_get_height")]-		public unowned string get_height ();-		[CCode (cname = "webkit_dom_html_object_element_get_hspace")]-		public long get_hspace ();-		[CCode (cname = "webkit_dom_html_object_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_object_element_get_standby")]-		public unowned string get_standby ();-		[CCode (cname = "webkit_dom_html_object_element_get_use_map")]-		public unowned string get_use_map ();-		[CCode (cname = "webkit_dom_html_object_element_get_validation_message")]-		public unowned string get_validation_message ();-		[CCode (cname = "webkit_dom_html_object_element_get_validity")]-		public unowned WebKit.DOMValidityState get_validity ();-		[CCode (cname = "webkit_dom_html_object_element_get_vspace")]-		public long get_vspace ();-		[CCode (cname = "webkit_dom_html_object_element_get_width")]-		public unowned string get_width ();-		[CCode (cname = "webkit_dom_html_object_element_get_will_validate")]-		public bool get_will_validate ();-		[CCode (cname = "webkit_dom_html_object_element_set_align")]-		public void set_align (string value);-		[CCode (cname = "webkit_dom_html_object_element_set_archive")]-		public void set_archive (string value);-		[CCode (cname = "webkit_dom_html_object_element_set_border")]-		public void set_border (string value);-		[CCode (cname = "webkit_dom_html_object_element_set_code")]-		public void set_code (string value);-		[CCode (cname = "webkit_dom_html_object_element_set_code_base")]-		public void set_code_base (string value);-		[CCode (cname = "webkit_dom_html_object_element_set_code_type")]-		public void set_code_type (string value);-		[CCode (cname = "webkit_dom_html_object_element_set_custom_validity")]-		public void set_custom_validity (string error);-		[CCode (cname = "webkit_dom_html_object_element_set_data")]-		public void set_data (string value);-		[CCode (cname = "webkit_dom_html_object_element_set_declare")]-		public void set_declare (bool value);-		[CCode (cname = "webkit_dom_html_object_element_set_height")]-		public void set_height (string value);-		[CCode (cname = "webkit_dom_html_object_element_set_hspace")]-		public void set_hspace (long value);-		[CCode (cname = "webkit_dom_html_object_element_set_name")]-		public void set_name (string value);-		[CCode (cname = "webkit_dom_html_object_element_set_standby")]-		public void set_standby (string value);-		[CCode (cname = "webkit_dom_html_object_element_set_use_map")]-		public void set_use_map (string value);-		[CCode (cname = "webkit_dom_html_object_element_set_vspace")]-		public void set_vspace (long value);-		[CCode (cname = "webkit_dom_html_object_element_set_width")]-		public void set_width (string value);-		public string align { get; set; }-		public string archive { get; set; }-		public string border { get; set; }-		public string code { get; set; }-		public string code_base { get; set; }-		public string code_type { get; set; }-		public WebKit.DOMDocument content_document { get; }-		public string data { get; set; }-		public bool declare { get; set; }-		public WebKit.DOMHTMLFormElement form { get; }-		public string height { get; set; }-		public long hspace { get; set; }-		public string name { get; set; }-		public string standby { get; set; }-		[NoAccessorMethod]-		public string type { owned get; set; }-		public string use_map { get; set; }-		public string validation_message { get; }-		public WebKit.DOMValidityState validity { get; }-		public long vspace { get; set; }-		public string width { get; set; }-		public bool will_validate { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLOptGroupElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLOptGroupElement ();-		[CCode (cname = "webkit_dom_html_opt_group_element_get_disabled")]-		public bool get_disabled ();-		[CCode (cname = "webkit_dom_html_opt_group_element_get_label")]-		public unowned string get_label ();-		[CCode (cname = "webkit_dom_html_opt_group_element_set_disabled")]-		public void set_disabled (bool value);-		[CCode (cname = "webkit_dom_html_opt_group_element_set_label")]-		public void set_label (string value);-		public bool disabled { get; set; }-		public string label { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLOptionElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLOptionElement ();-		[CCode (cname = "webkit_dom_html_option_element_get_default_selected")]-		public bool get_default_selected ();-		[CCode (cname = "webkit_dom_html_option_element_get_disabled")]-		public bool get_disabled ();-		[CCode (cname = "webkit_dom_html_option_element_get_form")]-		public unowned WebKit.DOMHTMLFormElement get_form ();-		[CCode (cname = "webkit_dom_html_option_element_get_index")]-		public long get_index ();-		[CCode (cname = "webkit_dom_html_option_element_get_label")]-		public unowned string get_label ();-		[CCode (cname = "webkit_dom_html_option_element_get_selected")]-		public bool get_selected ();-		[CCode (cname = "webkit_dom_html_option_element_get_text")]-		public unowned string get_text ();-		[CCode (cname = "webkit_dom_html_option_element_get_value")]-		public unowned string get_value ();-		[CCode (cname = "webkit_dom_html_option_element_set_default_selected")]-		public void set_default_selected (bool value);-		[CCode (cname = "webkit_dom_html_option_element_set_disabled")]-		public void set_disabled (bool value);-		[CCode (cname = "webkit_dom_html_option_element_set_label")]-		public void set_label (string value);-		[CCode (cname = "webkit_dom_html_option_element_set_selected")]-		public void set_selected (bool value);-		[CCode (cname = "webkit_dom_html_option_element_set_value")]-		public void set_value (string value);-		public bool default_selected { get; set; }-		public bool disabled { get; set; }-		public WebKit.DOMHTMLFormElement form { get; }-		public long index { get; }-		public string label { get; set; }-		public bool selected { get; set; }-		public string text { get; }-		public string value { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLOptionsCollection : WebKit.DOMHTMLCollection {-		[CCode (has_construct_function = false)]-		protected DOMHTMLOptionsCollection ();-		[CCode (cname = "webkit_dom_html_options_collection_get_selected_index")]-		public long get_selected_index ();-		[CCode (cname = "webkit_dom_html_options_collection_set_selected_index")]-		public void set_selected_index (long value);-		public long selected_index { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLParagraphElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLParagraphElement ();-		[CCode (cname = "webkit_dom_html_paragraph_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_paragraph_element_set_align")]-		public void set_align (string value);-		public string align { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLParamElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLParamElement ();-		[CCode (cname = "webkit_dom_html_param_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_param_element_get_value")]-		public unowned string get_value ();-		[CCode (cname = "webkit_dom_html_param_element_get_value_type")]-		public unowned string get_value_type ();-		[CCode (cname = "webkit_dom_html_param_element_set_name")]-		public void set_name (string value);-		[CCode (cname = "webkit_dom_html_param_element_set_value")]-		public void set_value (string value);-		[CCode (cname = "webkit_dom_html_param_element_set_value_type")]-		public void set_value_type (string value);-		public string name { get; set; }-		[NoAccessorMethod]-		public string type { owned get; set; }-		public string value { get; set; }-		public string value_type { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLPreElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLPreElement ();-		[CCode (cname = "webkit_dom_html_pre_element_get_width")]-		public long get_width ();-		[CCode (cname = "webkit_dom_html_pre_element_get_wrap")]-		public bool get_wrap ();-		[CCode (cname = "webkit_dom_html_pre_element_set_width")]-		public void set_width (long value);-		[CCode (cname = "webkit_dom_html_pre_element_set_wrap")]-		public void set_wrap (bool value);-		public long width { get; set; }-		public bool wrap { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLQuoteElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLQuoteElement ();-		[CCode (cname = "webkit_dom_html_quote_element_get_cite")]-		public unowned string get_cite ();-		[CCode (cname = "webkit_dom_html_quote_element_set_cite")]-		public void set_cite (string value);-		public string cite { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLScriptElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLScriptElement ();-		[CCode (cname = "webkit_dom_html_script_element_get_async")]-		public bool get_async ();-		[CCode (cname = "webkit_dom_html_script_element_get_charset")]-		public unowned string get_charset ();-		[CCode (cname = "webkit_dom_html_script_element_get_defer")]-		public bool get_defer ();-		[CCode (cname = "webkit_dom_html_script_element_get_event")]-		public unowned string get_event ();-		[CCode (cname = "webkit_dom_html_script_element_get_html_for")]-		public unowned string get_html_for ();-		[CCode (cname = "webkit_dom_html_script_element_get_src")]-		public unowned string get_src ();-		[CCode (cname = "webkit_dom_html_script_element_get_text")]-		public unowned string get_text ();-		[CCode (cname = "webkit_dom_html_script_element_set_async")]-		public void set_async (bool value);-		[CCode (cname = "webkit_dom_html_script_element_set_charset")]-		public void set_charset (string value);-		[CCode (cname = "webkit_dom_html_script_element_set_defer")]-		public void set_defer (bool value);-		[CCode (cname = "webkit_dom_html_script_element_set_event")]-		public void set_event (string value);-		[CCode (cname = "webkit_dom_html_script_element_set_html_for")]-		public void set_html_for (string value);-		[CCode (cname = "webkit_dom_html_script_element_set_src")]-		public void set_src (string value);-		[CCode (cname = "webkit_dom_html_script_element_set_text")]-		public void set_text (string value);-		public bool @async { get; set; }-		public string charset { get; set; }-		public bool defer { get; set; }-		public string event { get; set; }-		public string html_for { get; set; }-		public string src { get; set; }-		public string text { get; set; }-		[NoAccessorMethod]-		public string type { owned get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLSelectElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLSelectElement ();-		[CCode (cname = "webkit_dom_html_select_element_add")]-		public void add (WebKit.DOMHTMLElement element, WebKit.DOMHTMLElement before) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_select_element_check_validity")]-		public bool check_validity ();-		[CCode (cname = "webkit_dom_html_select_element_get_autofocus")]-		public bool get_autofocus ();-		[CCode (cname = "webkit_dom_html_select_element_get_disabled")]-		public bool get_disabled ();-		[CCode (cname = "webkit_dom_html_select_element_get_form")]-		public unowned WebKit.DOMHTMLFormElement get_form ();-		[CCode (cname = "webkit_dom_html_select_element_get_labels")]-		public unowned WebKit.DOMNodeList get_labels ();-		[CCode (cname = "webkit_dom_html_select_element_get_length")]-		public ulong get_length ();-		[CCode (cname = "webkit_dom_html_select_element_get_multiple")]-		public bool get_multiple ();-		[CCode (cname = "webkit_dom_html_select_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_select_element_get_options")]-		public unowned WebKit.DOMHTMLOptionsCollection get_options ();-		[CCode (cname = "webkit_dom_html_select_element_get_required")]-		public bool get_required ();-		[CCode (cname = "webkit_dom_html_select_element_get_selected_index")]-		public long get_selected_index ();-		[CCode (cname = "webkit_dom_html_select_element_get_size")]-		public long get_size ();-		[CCode (cname = "webkit_dom_html_select_element_get_validation_message")]-		public unowned string get_validation_message ();-		[CCode (cname = "webkit_dom_html_select_element_get_validity")]-		public unowned WebKit.DOMValidityState get_validity ();-		[CCode (cname = "webkit_dom_html_select_element_get_value")]-		public unowned string get_value ();-		[CCode (cname = "webkit_dom_html_select_element_get_will_validate")]-		public bool get_will_validate ();-		[CCode (cname = "webkit_dom_html_select_element_item")]-		public unowned WebKit.DOMNode item (ulong index);-		[CCode (cname = "webkit_dom_html_select_element_named_item")]-		public unowned WebKit.DOMNode named_item (string name);-		[CCode (cname = "webkit_dom_html_select_element_remove")]-		public void remove (long index);-		[CCode (cname = "webkit_dom_html_select_element_set_autofocus")]-		public void set_autofocus (bool value);-		[CCode (cname = "webkit_dom_html_select_element_set_custom_validity")]-		public void set_custom_validity (string error);-		[CCode (cname = "webkit_dom_html_select_element_set_disabled")]-		public void set_disabled (bool value);-		[CCode (cname = "webkit_dom_html_select_element_set_length")]-		public void set_length (ulong value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_select_element_set_multiple")]-		public void set_multiple (bool value);-		[CCode (cname = "webkit_dom_html_select_element_set_name")]-		public void set_name (string value);-		[CCode (cname = "webkit_dom_html_select_element_set_required")]-		public void set_required (bool value);-		[CCode (cname = "webkit_dom_html_select_element_set_selected_index")]-		public void set_selected_index (long value);-		[CCode (cname = "webkit_dom_html_select_element_set_size")]-		public void set_size (long value);-		[CCode (cname = "webkit_dom_html_select_element_set_value")]-		public void set_value (string value);-		public bool autofocus { get; set; }-		public bool disabled { get; set; }-		public WebKit.DOMHTMLFormElement form { get; }-		public WebKit.DOMNodeList labels { get; }-		public ulong length { get; set; }-		public bool multiple { get; set; }-		public string name { get; set; }-		public WebKit.DOMHTMLOptionsCollection options { get; }-		public bool required { get; set; }-		public long selected_index { get; set; }-		public long size { get; set; }-		[NoAccessorMethod]-		public string type { owned get; }-		public string validation_message { get; }-		public WebKit.DOMValidityState validity { get; }-		public string value { get; set; }-		public bool will_validate { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLStyleElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLStyleElement ();-		[CCode (cname = "webkit_dom_html_style_element_get_disabled")]-		public bool get_disabled ();-		[CCode (cname = "webkit_dom_html_style_element_get_media")]-		public unowned string get_media ();-		[CCode (cname = "webkit_dom_html_style_element_get_sheet")]-		public unowned WebKit.DOMStyleSheet get_sheet ();-		[CCode (cname = "webkit_dom_html_style_element_set_disabled")]-		public void set_disabled (bool value);-		[CCode (cname = "webkit_dom_html_style_element_set_media")]-		public void set_media (string value);-		public bool disabled { get; set; }-		public string media { get; set; }-		public WebKit.DOMStyleSheet sheet { get; }-		[NoAccessorMethod]-		public string type { owned get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLTableCaptionElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLTableCaptionElement ();-		[CCode (cname = "webkit_dom_html_table_caption_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_table_caption_element_set_align")]-		public void set_align (string value);-		public string align { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLTableCellElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLTableCellElement ();-		[CCode (cname = "webkit_dom_html_table_cell_element_get_abbr")]-		public unowned string get_abbr ();-		[CCode (cname = "webkit_dom_html_table_cell_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_table_cell_element_get_axis")]-		public unowned string get_axis ();-		[CCode (cname = "webkit_dom_html_table_cell_element_get_bg_color")]-		public unowned string get_bg_color ();-		[CCode (cname = "webkit_dom_html_table_cell_element_get_cell_index")]-		public long get_cell_index ();-		[CCode (cname = "webkit_dom_html_table_cell_element_get_ch")]-		public unowned string get_ch ();-		[CCode (cname = "webkit_dom_html_table_cell_element_get_ch_off")]-		public unowned string get_ch_off ();-		[CCode (cname = "webkit_dom_html_table_cell_element_get_col_span")]-		public long get_col_span ();-		[CCode (cname = "webkit_dom_html_table_cell_element_get_headers")]-		public unowned string get_headers ();-		[CCode (cname = "webkit_dom_html_table_cell_element_get_height")]-		public unowned string get_height ();-		[CCode (cname = "webkit_dom_html_table_cell_element_get_no_wrap")]-		public bool get_no_wrap ();-		[CCode (cname = "webkit_dom_html_table_cell_element_get_row_span")]-		public long get_row_span ();-		[CCode (cname = "webkit_dom_html_table_cell_element_get_scope")]-		public unowned string get_scope ();-		[CCode (cname = "webkit_dom_html_table_cell_element_get_v_align")]-		public unowned string get_v_align ();-		[CCode (cname = "webkit_dom_html_table_cell_element_get_width")]-		public unowned string get_width ();-		[CCode (cname = "webkit_dom_html_table_cell_element_set_abbr")]-		public void set_abbr (string value);-		[CCode (cname = "webkit_dom_html_table_cell_element_set_align")]-		public void set_align (string value);-		[CCode (cname = "webkit_dom_html_table_cell_element_set_axis")]-		public void set_axis (string value);-		[CCode (cname = "webkit_dom_html_table_cell_element_set_bg_color")]-		public void set_bg_color (string value);-		[CCode (cname = "webkit_dom_html_table_cell_element_set_ch")]-		public void set_ch (string value);-		[CCode (cname = "webkit_dom_html_table_cell_element_set_ch_off")]-		public void set_ch_off (string value);-		[CCode (cname = "webkit_dom_html_table_cell_element_set_col_span")]-		public void set_col_span (long value);-		[CCode (cname = "webkit_dom_html_table_cell_element_set_headers")]-		public void set_headers (string value);-		[CCode (cname = "webkit_dom_html_table_cell_element_set_height")]-		public void set_height (string value);-		[CCode (cname = "webkit_dom_html_table_cell_element_set_no_wrap")]-		public void set_no_wrap (bool value);-		[CCode (cname = "webkit_dom_html_table_cell_element_set_row_span")]-		public void set_row_span (long value);-		[CCode (cname = "webkit_dom_html_table_cell_element_set_scope")]-		public void set_scope (string value);-		[CCode (cname = "webkit_dom_html_table_cell_element_set_v_align")]-		public void set_v_align (string value);-		[CCode (cname = "webkit_dom_html_table_cell_element_set_width")]-		public void set_width (string value);-		public string abbr { get; set; }-		public string align { get; set; }-		public string axis { get; set; }-		public string bg_color { get; set; }-		public long cell_index { get; }-		public string ch { get; set; }-		public string ch_off { get; set; }-		public long col_span { get; set; }-		public string headers { get; set; }-		public string height { get; set; }-		public bool no_wrap { get; set; }-		public long row_span { get; set; }-		public string scope { get; set; }-		public string v_align { get; set; }-		public string width { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLTableColElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLTableColElement ();-		[CCode (cname = "webkit_dom_html_table_col_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_table_col_element_get_ch")]-		public unowned string get_ch ();-		[CCode (cname = "webkit_dom_html_table_col_element_get_ch_off")]-		public unowned string get_ch_off ();-		[CCode (cname = "webkit_dom_html_table_col_element_get_span")]-		public long get_span ();-		[CCode (cname = "webkit_dom_html_table_col_element_get_v_align")]-		public unowned string get_v_align ();-		[CCode (cname = "webkit_dom_html_table_col_element_get_width")]-		public unowned string get_width ();-		[CCode (cname = "webkit_dom_html_table_col_element_set_align")]-		public void set_align (string value);-		[CCode (cname = "webkit_dom_html_table_col_element_set_ch")]-		public void set_ch (string value);-		[CCode (cname = "webkit_dom_html_table_col_element_set_ch_off")]-		public void set_ch_off (string value);-		[CCode (cname = "webkit_dom_html_table_col_element_set_span")]-		public void set_span (long value);-		[CCode (cname = "webkit_dom_html_table_col_element_set_v_align")]-		public void set_v_align (string value);-		[CCode (cname = "webkit_dom_html_table_col_element_set_width")]-		public void set_width (string value);-		public string align { get; set; }-		public string ch { get; set; }-		public string ch_off { get; set; }-		public long span { get; set; }-		public string v_align { get; set; }-		public string width { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLTableElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLTableElement ();-		[CCode (cname = "webkit_dom_html_table_element_create_caption")]-		public unowned WebKit.DOMHTMLElement create_caption ();-		[CCode (cname = "webkit_dom_html_table_element_create_t_foot")]-		public unowned WebKit.DOMHTMLElement create_t_foot ();-		[CCode (cname = "webkit_dom_html_table_element_create_t_head")]-		public unowned WebKit.DOMHTMLElement create_t_head ();-		[CCode (cname = "webkit_dom_html_table_element_delete_caption")]-		public void delete_caption ();-		[CCode (cname = "webkit_dom_html_table_element_delete_row")]-		public void delete_row (long index) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_table_element_delete_t_foot")]-		public void delete_t_foot ();-		[CCode (cname = "webkit_dom_html_table_element_delete_t_head")]-		public void delete_t_head ();-		[CCode (cname = "webkit_dom_html_table_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_table_element_get_bg_color")]-		public unowned string get_bg_color ();-		[CCode (cname = "webkit_dom_html_table_element_get_border")]-		public unowned string get_border ();-		[CCode (cname = "webkit_dom_html_table_element_get_caption")]-		public unowned WebKit.DOMHTMLTableCaptionElement get_caption ();-		[CCode (cname = "webkit_dom_html_table_element_get_cell_padding")]-		public unowned string get_cell_padding ();-		[CCode (cname = "webkit_dom_html_table_element_get_cell_spacing")]-		public unowned string get_cell_spacing ();-		[CCode (cname = "webkit_dom_html_table_element_get_frame")]-		public unowned string get_frame ();-		[CCode (cname = "webkit_dom_html_table_element_get_rows")]-		public unowned WebKit.DOMHTMLCollection get_rows ();-		[CCode (cname = "webkit_dom_html_table_element_get_rules")]-		public unowned string get_rules ();-		[CCode (cname = "webkit_dom_html_table_element_get_summary")]-		public unowned string get_summary ();-		[CCode (cname = "webkit_dom_html_table_element_get_t_bodies")]-		public unowned WebKit.DOMHTMLCollection get_t_bodies ();-		[CCode (cname = "webkit_dom_html_table_element_get_t_foot")]-		public unowned WebKit.DOMHTMLTableSectionElement get_t_foot ();-		[CCode (cname = "webkit_dom_html_table_element_get_t_head")]-		public unowned WebKit.DOMHTMLTableSectionElement get_t_head ();-		[CCode (cname = "webkit_dom_html_table_element_get_width")]-		public unowned string get_width ();-		[CCode (cname = "webkit_dom_html_table_element_insert_row")]-		public unowned WebKit.DOMHTMLElement insert_row (long index) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_table_element_set_align")]-		public void set_align (string value);-		[CCode (cname = "webkit_dom_html_table_element_set_bg_color")]-		public void set_bg_color (string value);-		[CCode (cname = "webkit_dom_html_table_element_set_border")]-		public void set_border (string value);-		[CCode (cname = "webkit_dom_html_table_element_set_caption")]-		public void set_caption (WebKit.DOMHTMLTableCaptionElement value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_table_element_set_cell_padding")]-		public void set_cell_padding (string value);-		[CCode (cname = "webkit_dom_html_table_element_set_cell_spacing")]-		public void set_cell_spacing (string value);-		[CCode (cname = "webkit_dom_html_table_element_set_frame")]-		public void set_frame (string value);-		[CCode (cname = "webkit_dom_html_table_element_set_rules")]-		public void set_rules (string value);-		[CCode (cname = "webkit_dom_html_table_element_set_summary")]-		public void set_summary (string value);-		[CCode (cname = "webkit_dom_html_table_element_set_t_foot")]-		public void set_t_foot (WebKit.DOMHTMLTableSectionElement value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_table_element_set_t_head")]-		public void set_t_head (WebKit.DOMHTMLTableSectionElement value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_table_element_set_width")]-		public void set_width (string value);-		public string align { get; set; }-		public string bg_color { get; set; }-		public string border { get; set; }-		public WebKit.DOMHTMLTableCaptionElement caption { get; set; }-		public string cell_padding { get; set; }-		public string cell_spacing { get; set; }-		public string frame { get; set; }-		public WebKit.DOMHTMLCollection rows { get; }-		public string rules { get; set; }-		public string summary { get; set; }-		public WebKit.DOMHTMLCollection t_bodies { get; }-		public WebKit.DOMHTMLTableSectionElement t_foot { get; set; }-		public WebKit.DOMHTMLTableSectionElement t_head { get; set; }-		public string width { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLTableRowElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLTableRowElement ();-		[CCode (cname = "webkit_dom_html_table_row_element_delete_cell")]-		public void delete_cell (long index) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_table_row_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_table_row_element_get_bg_color")]-		public unowned string get_bg_color ();-		[CCode (cname = "webkit_dom_html_table_row_element_get_cells")]-		public unowned WebKit.DOMHTMLCollection get_cells ();-		[CCode (cname = "webkit_dom_html_table_row_element_get_ch")]-		public unowned string get_ch ();-		[CCode (cname = "webkit_dom_html_table_row_element_get_ch_off")]-		public unowned string get_ch_off ();-		[CCode (cname = "webkit_dom_html_table_row_element_get_row_index")]-		public long get_row_index ();-		[CCode (cname = "webkit_dom_html_table_row_element_get_section_row_index")]-		public long get_section_row_index ();-		[CCode (cname = "webkit_dom_html_table_row_element_get_v_align")]-		public unowned string get_v_align ();-		[CCode (cname = "webkit_dom_html_table_row_element_insert_cell")]-		public unowned WebKit.DOMHTMLElement insert_cell (long index) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_table_row_element_set_align")]-		public void set_align (string value);-		[CCode (cname = "webkit_dom_html_table_row_element_set_bg_color")]-		public void set_bg_color (string value);-		[CCode (cname = "webkit_dom_html_table_row_element_set_ch")]-		public void set_ch (string value);-		[CCode (cname = "webkit_dom_html_table_row_element_set_ch_off")]-		public void set_ch_off (string value);-		[CCode (cname = "webkit_dom_html_table_row_element_set_v_align")]-		public void set_v_align (string value);-		public string align { get; set; }-		public string bg_color { get; set; }-		public WebKit.DOMHTMLCollection cells { get; }-		public string ch { get; set; }-		public string ch_off { get; set; }-		public long row_index { get; }-		public long section_row_index { get; }-		public string v_align { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLTableSectionElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLTableSectionElement ();-		[CCode (cname = "webkit_dom_html_table_section_element_delete_row")]-		public void delete_row (long index) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_table_section_element_get_align")]-		public unowned string get_align ();-		[CCode (cname = "webkit_dom_html_table_section_element_get_ch")]-		public unowned string get_ch ();-		[CCode (cname = "webkit_dom_html_table_section_element_get_ch_off")]-		public unowned string get_ch_off ();-		[CCode (cname = "webkit_dom_html_table_section_element_get_rows")]-		public unowned WebKit.DOMHTMLCollection get_rows ();-		[CCode (cname = "webkit_dom_html_table_section_element_get_v_align")]-		public unowned string get_v_align ();-		[CCode (cname = "webkit_dom_html_table_section_element_insert_row")]-		public unowned WebKit.DOMHTMLElement insert_row (long index) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_table_section_element_set_align")]-		public void set_align (string value);-		[CCode (cname = "webkit_dom_html_table_section_element_set_ch")]-		public void set_ch (string value);-		[CCode (cname = "webkit_dom_html_table_section_element_set_ch_off")]-		public void set_ch_off (string value);-		[CCode (cname = "webkit_dom_html_table_section_element_set_v_align")]-		public void set_v_align (string value);-		public string align { get; set; }-		public string ch { get; set; }-		public string ch_off { get; set; }-		public WebKit.DOMHTMLCollection rows { get; }-		public string v_align { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLTextAreaElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLTextAreaElement ();-		[CCode (cname = "webkit_dom_html_text_area_element_check_validity")]-		public bool check_validity ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_access_key")]-		public unowned string get_access_key ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_autofocus")]-		public bool get_autofocus ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_cols")]-		public long get_cols ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_default_value")]-		public unowned string get_default_value ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_disabled")]-		public bool get_disabled ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_form")]-		public unowned WebKit.DOMHTMLFormElement get_form ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_labels")]-		public unowned WebKit.DOMNodeList get_labels ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_max_length")]-		public long get_max_length ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_placeholder")]-		public unowned string get_placeholder ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_read_only")]-		public bool get_read_only ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_required")]-		public bool get_required ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_rows")]-		public long get_rows ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_selection_direction")]-		public unowned string get_selection_direction ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_selection_end")]-		public long get_selection_end ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_selection_start")]-		public long get_selection_start ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_text_length")]-		public ulong get_text_length ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_validation_message")]-		public unowned string get_validation_message ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_validity")]-		public unowned WebKit.DOMValidityState get_validity ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_value")]-		public unowned string get_value ();-		[CCode (cname = "webkit_dom_html_text_area_element_get_will_validate")]-		public bool get_will_validate ();-		[CCode (cname = "webkit_dom_html_text_area_element_is_edited")]-		public bool is_edited ();-		[CCode (cname = "webkit_dom_html_text_area_element_select")]-		public void select ();-		[CCode (cname = "webkit_dom_html_text_area_element_set_access_key")]-		public void set_access_key (string value);-		[CCode (cname = "webkit_dom_html_text_area_element_set_autofocus")]-		public void set_autofocus (bool value);-		[CCode (cname = "webkit_dom_html_text_area_element_set_cols")]-		public void set_cols (long value);-		[CCode (cname = "webkit_dom_html_text_area_element_set_custom_validity")]-		public void set_custom_validity (string error);-		[CCode (cname = "webkit_dom_html_text_area_element_set_default_value")]-		public void set_default_value (string value);-		[CCode (cname = "webkit_dom_html_text_area_element_set_disabled")]-		public void set_disabled (bool value);-		[CCode (cname = "webkit_dom_html_text_area_element_set_max_length")]-		public void set_max_length (long value) throws GLib.Error;-		[CCode (cname = "webkit_dom_html_text_area_element_set_name")]-		public void set_name (string value);-		[CCode (cname = "webkit_dom_html_text_area_element_set_placeholder")]-		public void set_placeholder (string value);-		[CCode (cname = "webkit_dom_html_text_area_element_set_read_only")]-		public void set_read_only (bool value);-		[CCode (cname = "webkit_dom_html_text_area_element_set_required")]-		public void set_required (bool value);-		[CCode (cname = "webkit_dom_html_text_area_element_set_rows")]-		public void set_rows (long value);-		[CCode (cname = "webkit_dom_html_text_area_element_set_selection_direction")]-		public void set_selection_direction (string value);-		[CCode (cname = "webkit_dom_html_text_area_element_set_selection_end")]-		public void set_selection_end (long value);-		[CCode (cname = "webkit_dom_html_text_area_element_set_selection_range")]-		public void set_selection_range (long start, long end, string direction);-		[CCode (cname = "webkit_dom_html_text_area_element_set_selection_start")]-		public void set_selection_start (long value);-		[CCode (cname = "webkit_dom_html_text_area_element_set_value")]-		public void set_value (string value);-		public string access_key { get; set; }-		public bool autofocus { get; set; }-		public long cols { get; set; }-		public string default_value { get; set; }-		public bool disabled { get; set; }-		public WebKit.DOMHTMLFormElement form { get; }-		public WebKit.DOMNodeList labels { get; }-		public long max_length { get; set; }-		public string name { get; set; }-		public string placeholder { get; set; }-		public bool read_only { get; set; }-		public bool required { get; set; }-		public long rows { get; set; }-		public string selection_direction { get; set; }-		public long selection_end { get; set; }-		public long selection_start { get; set; }-		public ulong text_length { get; }-		[NoAccessorMethod]-		public string type { owned get; }-		public string validation_message { get; }-		public WebKit.DOMValidityState validity { get; }-		public string value { get; set; }-		public bool will_validate { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLTitleElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLTitleElement ();-		[CCode (cname = "webkit_dom_html_title_element_get_text")]-		public unowned string get_text ();-		[CCode (cname = "webkit_dom_html_title_element_set_text")]-		public void set_text (string value);-		public string text { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLUListElement : WebKit.DOMHTMLElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLUListElement ();-		[CCode (cname = "webkit_dom_htmlu_list_element_get_compact")]-		public bool get_compact ();-		[CCode (cname = "webkit_dom_htmlu_list_element_set_compact")]-		public void set_compact (bool value);-		public bool compact { get; set; }-		[NoAccessorMethod]-		public string type { owned get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHTMLVideoElement : WebKit.DOMHTMLMediaElement, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMHTMLVideoElement ();-		[CCode (cname = "webkit_dom_html_video_element_get_height")]-		public ulong get_height ();-		[CCode (cname = "webkit_dom_html_video_element_get_poster")]-		public unowned string get_poster ();-		[CCode (cname = "webkit_dom_html_video_element_get_video_height")]-		public ulong get_video_height ();-		[CCode (cname = "webkit_dom_html_video_element_get_video_width")]-		public ulong get_video_width ();-		[CCode (cname = "webkit_dom_html_video_element_get_webkit_decoded_frame_count")]-		public ulong get_webkit_decoded_frame_count ();-		[CCode (cname = "webkit_dom_html_video_element_get_webkit_displaying_fullscreen")]-		public bool get_webkit_displaying_fullscreen ();-		[CCode (cname = "webkit_dom_html_video_element_get_webkit_dropped_frame_count")]-		public ulong get_webkit_dropped_frame_count ();-		[CCode (cname = "webkit_dom_html_video_element_get_webkit_supports_fullscreen")]-		public bool get_webkit_supports_fullscreen ();-		[CCode (cname = "webkit_dom_html_video_element_get_width")]-		public ulong get_width ();-		[CCode (cname = "webkit_dom_html_video_element_set_height")]-		public void set_height (ulong value);-		[CCode (cname = "webkit_dom_html_video_element_set_poster")]-		public void set_poster (string value);-		[CCode (cname = "webkit_dom_html_video_element_set_width")]-		public void set_width (ulong value);-		[CCode (cname = "webkit_dom_html_video_element_webkit_enter_full_screen")]-		public void webkit_enter_full_screen () throws GLib.Error;-		[CCode (cname = "webkit_dom_html_video_element_webkit_enter_fullscreen")]-		public void webkit_enter_fullscreen () throws GLib.Error;-		[CCode (cname = "webkit_dom_html_video_element_webkit_exit_full_screen")]-		public void webkit_exit_full_screen ();-		[CCode (cname = "webkit_dom_html_video_element_webkit_exit_fullscreen")]-		public void webkit_exit_fullscreen ();-		public ulong height { get; set; }-		public string poster { get; set; }-		public ulong video_height { get; }-		public ulong video_width { get; }-		public bool webkit_displaying_fullscreen { get; }-		public bool webkit_supports_fullscreen { get; }-		public ulong width { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMHistory : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMHistory ();-		public void back ();-		public void forward ();-		public ulong get_length ();-		public void go (long distance);-		public ulong length { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMLocation : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMLocation ();-		public unowned string get_origin ();-		public unowned string get_parameter (string name);-		public string origin { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMMediaError : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMMediaError ();-		public ushort get_code ();-		public uint code { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMMediaList : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMMediaList ();-		public void append_medium (string new_medium) throws GLib.Error;-		public void delete_medium (string old_medium) throws GLib.Error;-		public ulong get_length ();-		public unowned string get_media_text ();-		public unowned string item (ulong index);-		public void set_media_text (string value) throws GLib.Error;-		public ulong length { get; }-		public string media_text { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMMediaQueryList : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMMediaQueryList ();-		public bool get_matches ();-		public unowned string get_media ();-		public bool matches { get; }-		public string media { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMMemoryInfo : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMMemoryInfo ();-		public ulong get_js_heap_size_limit ();-		public ulong get_total_js_heap_size ();-		public ulong get_used_js_heap_size ();-		public ulong js_heap_size_limit { get; }-		public ulong total_js_heap_size { get; }-		public ulong used_js_heap_size { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMMessagePort : WebKit.DOMObject, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMMessagePort ();-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMMouseEvent : WebKit.DOMUIEvent {-		[CCode (has_construct_function = false)]-		protected DOMMouseEvent ();-		public bool get_alt_key ();-		public ushort get_button ();-		public long get_client_x ();-		public long get_client_y ();-		public bool get_ctrl_key ();-		public unowned WebKit.DOMNode get_from_element ();-		public bool get_meta_key ();-		public long get_offset_x ();-		public long get_offset_y ();-		public unowned WebKit.DOMEventTarget get_related_target ();-		public long get_screen_x ();-		public long get_screen_y ();-		public bool get_shift_key ();-		public unowned WebKit.DOMNode get_to_element ();-		public long get_x ();-		public long get_y ();-		public void init_mouse_event (string type, bool can_bubble, bool cancelable, WebKit.DOMDOMWindow view, long detail, long screen_x, long screen_y, long client_x, long client_y, bool ctrl_key, bool alt_key, bool shift_key, bool meta_key, ushort button, WebKit.DOMEventTarget related_target);-		public bool alt_key { get; }-		public uint button { get; }-		public long client_x { get; }-		public long client_y { get; }-		public bool ctrl_key { get; }-		public WebKit.DOMNode from_element { get; }-		public bool meta_key { get; }-		public long offset_x { get; }-		public long offset_y { get; }-		public WebKit.DOMEventTarget related_target { get; }-		public long screen_x { get; }-		public long screen_y { get; }-		public bool shift_key { get; }-		public WebKit.DOMNode to_element { get; }-		public long x { get; }-		public long y { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMNamedNodeMap : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMNamedNodeMap ();-		public ulong get_length ();-		public unowned WebKit.DOMNode get_named_item (string name);-		public unowned WebKit.DOMNode get_named_item_ns (string namespace_uri, string local_name);-		public unowned WebKit.DOMNode item (ulong index);-		public unowned WebKit.DOMNode remove_named_item (string name) throws GLib.Error;-		public unowned WebKit.DOMNode remove_named_item_ns (string namespace_uri, string local_name) throws GLib.Error;-		public unowned WebKit.DOMNode set_named_item (WebKit.DOMNode node) throws GLib.Error;-		public unowned WebKit.DOMNode set_named_item_ns (WebKit.DOMNode node) throws GLib.Error;-		public ulong length { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMNavigator : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMNavigator ();-		public unowned string get_app_code_name ();-		public unowned string get_app_name ();-		public unowned string get_app_version ();-		public bool get_cookie_enabled ();-		public unowned WebKit.DOMGeolocation get_geolocation ();-		public unowned string get_language ();-		public unowned WebKit.DOMDOMMimeTypeArray get_mime_types ();-		public bool get_on_line ();-		public unowned string get_platform ();-		public unowned WebKit.DOMDOMPluginArray get_plugins ();-		public unowned string get_product ();-		public unowned string get_product_sub ();-		public void get_storage_updates ();-		public unowned string get_user_agent ();-		public unowned string get_vendor ();-		public unowned string get_vendor_sub ();-		public bool java_enabled ();-		public string app_code_name { get; }-		public string app_name { get; }-		public string app_version { get; }-		public bool cookie_enabled { get; }-		public WebKit.DOMGeolocation geolocation { get; }-		public string language { get; }-		public WebKit.DOMDOMMimeTypeArray mime_types { get; }-		public bool on_line { get; }-		public string platform { get; }-		public WebKit.DOMDOMPluginArray plugins { get; }-		public string product { get; }-		public string product_sub { get; }-		public string user_agent { get; }-		public string vendor { get; }-		public string vendor_sub { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMNode : WebKit.DOMObject, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMNode ();-		public unowned WebKit.DOMNode append_child (WebKit.DOMNode new_child) throws GLib.Error;-		public unowned WebKit.DOMNode clone_node (bool deep);-		public ushort compare_document_position (WebKit.DOMNode other);-		public bool contains (WebKit.DOMNode other);-		public unowned WebKit.DOMNamedNodeMap get_attributes ();-		public unowned string get_base_uri ();-		public unowned WebKit.DOMNodeList get_child_nodes ();-		public unowned WebKit.DOMNode get_first_child ();-		public unowned WebKit.DOMNode get_last_child ();-		public unowned string get_local_name ();-		public unowned string get_namespace_uri ();-		public unowned WebKit.DOMNode get_next_sibling ();-		public unowned string get_node_name ();-		public ushort get_node_type ();-		public unowned string get_node_value ();-		public unowned WebKit.DOMDocument get_owner_document ();-		public unowned WebKit.DOMElement get_parent_element ();-		public unowned WebKit.DOMNode get_parent_node ();-		public unowned string get_prefix ();-		public unowned WebKit.DOMNode get_previous_sibling ();-		public unowned string get_text_content ();-		public bool has_attributes ();-		public bool has_child_nodes ();-		public unowned WebKit.DOMNode insert_before (WebKit.DOMNode new_child, WebKit.DOMNode ref_child) throws GLib.Error;-		public bool is_default_namespace (string namespace_uri);-		public bool is_equal_node (WebKit.DOMNode other);-		public bool is_same_node (WebKit.DOMNode other);-		public bool is_supported (string feature, string version);-		public unowned string lookup_namespace_uri (string prefix);-		public unowned string lookup_prefix (string namespace_uri);-		public void normalize ();-		public unowned WebKit.DOMNode remove_child (WebKit.DOMNode old_child) throws GLib.Error;-		public unowned WebKit.DOMNode replace_child (WebKit.DOMNode new_child, WebKit.DOMNode old_child) throws GLib.Error;-		public void set_node_value (string value) throws GLib.Error;-		public void set_prefix (string value) throws GLib.Error;-		public void set_text_content (string value) throws GLib.Error;-		public WebKit.DOMNamedNodeMap attributes { get; }-		public string base_uri { get; }-		public WebKit.DOMNodeList child_nodes { get; }-		public WebKit.DOMNode first_child { get; }-		public WebKit.DOMNode last_child { get; }-		public string local_name { get; }-		public string namespace_uri { get; }-		public WebKit.DOMNode next_sibling { get; }-		public string node_name { get; }-		public uint node_type { get; }-		public string node_value { get; set; }-		public WebKit.DOMDocument owner_document { get; }-		public WebKit.DOMElement parent_element { get; }-		public WebKit.DOMNode parent_node { get; }-		public string prefix { get; set; }-		public WebKit.DOMNode previous_sibling { get; }-		public string text_content { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMNodeFilter : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMNodeFilter ();-		public short accept_node (WebKit.DOMNode n);-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMNodeIterator : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMNodeIterator ();-		public void detach ();-		public bool get_expand_entity_references ();-		public unowned WebKit.DOMNodeFilter get_filter ();-		public bool get_pointer_before_reference_node ();-		public unowned WebKit.DOMNode get_reference_node ();-		public unowned WebKit.DOMNode get_root ();-		public ulong get_what_to_show ();-		public unowned WebKit.DOMNode next_node () throws GLib.Error;-		public unowned WebKit.DOMNode previous_node () throws GLib.Error;-		public bool expand_entity_references { get; }-		public WebKit.DOMNodeFilter filter { get; }-		public bool pointer_before_reference_node { get; }-		public WebKit.DOMNode reference_node { get; }-		public WebKit.DOMNode root { get; }-		public ulong what_to_show { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMNodeList : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMNodeList ();-		public ulong get_length ();-		public unowned WebKit.DOMNode item (ulong index);-		public ulong length { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMObject : GLib.Object {-		public void* coreObject;-		[CCode (has_construct_function = false)]-		protected DOMObject ();-		public void* core_object { construct; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMProcessingInstruction : WebKit.DOMNode, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMProcessingInstruction ();-		public unowned string get_data ();-		public unowned WebKit.DOMStyleSheet get_sheet ();-		public unowned string get_target ();-		public void set_data (string value) throws GLib.Error;-		public string data { get; set; }-		public WebKit.DOMStyleSheet sheet { get; }-		public string target { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMRange : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMRange ();-		public unowned WebKit.DOMDocumentFragment clone_contents () throws GLib.Error;-		public unowned WebKit.DOMRange clone_range () throws GLib.Error;-		public void collapse (bool to_start) throws GLib.Error;-		public short compare_boundary_points (ushort how, WebKit.DOMRange source_range) throws GLib.Error;-		public short compare_node (WebKit.DOMNode ref_node) throws GLib.Error;-		public short compare_point (WebKit.DOMNode ref_node, long offset) throws GLib.Error;-		public unowned WebKit.DOMDocumentFragment create_contextual_fragment (string html) throws GLib.Error;-		public void delete_contents () throws GLib.Error;-		public void detach () throws GLib.Error;-		public void expand (string unit) throws GLib.Error;-		public unowned WebKit.DOMDocumentFragment extract_contents () throws GLib.Error;-		public bool get_collapsed () throws GLib.Error;-		public unowned WebKit.DOMNode get_common_ancestor_container () throws GLib.Error;-		public unowned WebKit.DOMNode get_end_container () throws GLib.Error;-		public long get_end_offset () throws GLib.Error;-		public unowned WebKit.DOMNode get_start_container () throws GLib.Error;-		public long get_start_offset () throws GLib.Error;-		public unowned string get_text ();-		public void insert_node (WebKit.DOMNode new_node) throws GLib.Error;-		public bool intersects_node (WebKit.DOMNode ref_node) throws GLib.Error;-		public bool is_point_in_range (WebKit.DOMNode ref_node, long offset) throws GLib.Error;-		public void select_node (WebKit.DOMNode ref_node) throws GLib.Error;-		public void select_node_contents (WebKit.DOMNode ref_node) throws GLib.Error;-		public void set_end (WebKit.DOMNode ref_node, long offset) throws GLib.Error;-		public void set_end_after (WebKit.DOMNode ref_node) throws GLib.Error;-		public void set_end_before (WebKit.DOMNode ref_node) throws GLib.Error;-		public void set_start (WebKit.DOMNode ref_node, long offset) throws GLib.Error;-		public void set_start_after (WebKit.DOMNode ref_node) throws GLib.Error;-		public void set_start_before (WebKit.DOMNode ref_node) throws GLib.Error;-		public void surround_contents (WebKit.DOMNode new_parent) throws GLib.Error;-		public unowned string to_string () throws GLib.Error;-		public bool collapsed { get; }-		public WebKit.DOMNode common_ancestor_container { get; }-		public WebKit.DOMNode end_container { get; }-		public long end_offset { get; }-		public WebKit.DOMNode start_container { get; }-		public long start_offset { get; }-		public string text { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMScreen : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMScreen ();-		public ulong get_avail_height ();-		public long get_avail_left ();-		public long get_avail_top ();-		public ulong get_avail_width ();-		public ulong get_color_depth ();-		public ulong get_height ();-		public ulong get_pixel_depth ();-		public ulong get_width ();-		public ulong avail_height { get; }-		public long avail_left { get; }-		public long avail_top { get; }-		public ulong avail_width { get; }-		public ulong color_depth { get; }-		public ulong height { get; }-		public ulong pixel_depth { get; }-		public ulong width { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMStorage : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMStorage ();-		public void clear ();-		public unowned string get_item (string key);-		public ulong get_length ();-		public unowned string key (ulong index);-		public void remove_item (string key);-		public void set_item (string key, string data) throws GLib.Error;-		public ulong length { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMStyleMedia : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMStyleMedia ();-		public bool match_medium (string mediaquery);-		[NoAccessorMethod]-		public string type { owned get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMStyleSheet : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMStyleSheet ();-		public bool get_disabled ();-		public unowned string get_href ();-		public unowned WebKit.DOMMediaList get_media ();-		public unowned WebKit.DOMNode get_owner_node ();-		public unowned WebKit.DOMStyleSheet get_parent_style_sheet ();-		public unowned string get_title ();-		public void set_disabled (bool value);-		public bool disabled { get; set; }-		public string href { get; }-		public WebKit.DOMMediaList media { get; }-		public WebKit.DOMNode owner_node { get; }-		public WebKit.DOMStyleSheet parent_style_sheet { get; }-		public string title { get; }-		[NoAccessorMethod]-		public string type { owned get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMStyleSheetList : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMStyleSheetList ();-		public ulong get_length ();-		public unowned WebKit.DOMStyleSheet item (ulong index);-		public ulong length { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMText : WebKit.DOMCharacterData, WebKit.DOMEventTarget {-		[CCode (has_construct_function = false)]-		protected DOMText ();-		public unowned string get_whole_text ();-		public unowned WebKit.DOMText replace_whole_text (string content) throws GLib.Error;-		public unowned WebKit.DOMText split_text (ulong offset) throws GLib.Error;-		public string whole_text { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMTimeRanges : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMTimeRanges ();-		public float end (ulong index) throws GLib.Error;-		public ulong get_length ();-		public float start (ulong index) throws GLib.Error;-		public ulong length { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMTreeWalker : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMTreeWalker ();-		public unowned WebKit.DOMNode first_child ();-		public unowned WebKit.DOMNode get_current_node ();-		public bool get_expand_entity_references ();-		public unowned WebKit.DOMNodeFilter get_filter ();-		public unowned WebKit.DOMNode get_root ();-		public ulong get_what_to_show ();-		public unowned WebKit.DOMNode last_child ();-		public unowned WebKit.DOMNode next_node ();-		public unowned WebKit.DOMNode next_sibling ();-		public unowned WebKit.DOMNode parent_node ();-		public unowned WebKit.DOMNode previous_node ();-		public unowned WebKit.DOMNode previous_sibling ();-		public void set_current_node (WebKit.DOMNode value) throws GLib.Error;-		public WebKit.DOMNode current_node { get; set; }-		public bool expand_entity_references { get; }-		public WebKit.DOMNodeFilter filter { get; }-		public WebKit.DOMNode root { get; }-		public ulong what_to_show { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMUIEvent : WebKit.DOMEvent {-		[CCode (has_construct_function = false)]-		protected DOMUIEvent ();-		[CCode (cname = "webkit_dom_ui_event_get_char_code")]-		public long get_char_code ();-		[CCode (cname = "webkit_dom_ui_event_get_detail")]-		public long get_detail ();-		[CCode (cname = "webkit_dom_ui_event_get_key_code")]-		public long get_key_code ();-		[CCode (cname = "webkit_dom_ui_event_get_layer_x")]-		public long get_layer_x ();-		[CCode (cname = "webkit_dom_ui_event_get_layer_y")]-		public long get_layer_y ();-		[CCode (cname = "webkit_dom_ui_event_get_page_x")]-		public long get_page_x ();-		[CCode (cname = "webkit_dom_ui_event_get_page_y")]-		public long get_page_y ();-		[CCode (cname = "webkit_dom_ui_event_get_view")]-		public unowned WebKit.DOMDOMWindow get_view ();-		[CCode (cname = "webkit_dom_ui_event_get_which")]-		public long get_which ();-		[CCode (cname = "webkit_dom_ui_event_init_ui_event")]-		public void init_ui_event (string type, bool can_bubble, bool cancelable, WebKit.DOMDOMWindow view, long detail);-		public long char_code { get; }-		public long detail { get; }-		public long key_code { get; }-		public long layer_x { get; }-		public long layer_y { get; }-		public long page_x { get; }-		public long page_y { get; }-		public WebKit.DOMDOMWindow view { get; }-		public long which { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMValidityState : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMValidityState ();-		public bool get_custom_error ();-		public bool get_pattern_mismatch ();-		public bool get_range_overflow ();-		public bool get_range_underflow ();-		public bool get_step_mismatch ();-		public bool get_too_long ();-		public bool get_type_mismatch ();-		public bool get_valid ();-		public bool get_value_missing ();-		public bool custom_error { get; }-		public bool pattern_mismatch { get; }-		public bool range_overflow { get; }-		public bool range_underflow { get; }-		public bool step_mismatch { get; }-		public bool too_long { get; }-		public bool type_mismatch { get; }-		public bool valid { get; }-		public bool value_missing { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMWebKitAnimation : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMWebKitAnimation ();-		[CCode (cname = "webkit_dom_webkit_animation_get_delay")]-		public double get_delay ();-		[CCode (cname = "webkit_dom_webkit_animation_get_direction")]-		public ushort get_direction ();-		[CCode (cname = "webkit_dom_webkit_animation_get_duration")]-		public double get_duration ();-		[CCode (cname = "webkit_dom_webkit_animation_get_elapsed_time")]-		public double get_elapsed_time ();-		[CCode (cname = "webkit_dom_webkit_animation_get_ended")]-		public bool get_ended ();-		[CCode (cname = "webkit_dom_webkit_animation_get_fill_mode")]-		public ushort get_fill_mode ();-		[CCode (cname = "webkit_dom_webkit_animation_get_name")]-		public unowned string get_name ();-		[CCode (cname = "webkit_dom_webkit_animation_get_paused")]-		public bool get_paused ();-		[CCode (cname = "webkit_dom_webkit_animation_pause")]-		public void pause ();-		[CCode (cname = "webkit_dom_webkit_animation_play")]-		public void play ();-		[CCode (cname = "webkit_dom_webkit_animation_set_elapsed_time")]-		public void set_elapsed_time (double value);-		public double delay { get; }-		public uint direction { get; }-		public double duration { get; }-		public double elapsed_time { get; set; }-		public bool ended { get; }-		public uint fill_mode { get; }-		[NoAccessorMethod]-		public int iteration_count { get; }-		public string name { get; }-		public bool paused { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMWebKitAnimationList : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMWebKitAnimationList ();-		[CCode (cname = "webkit_dom_webkit_animation_list_get_length")]-		public ulong get_length ();-		[CCode (cname = "webkit_dom_webkit_animation_list_item")]-		public unowned WebKit.DOMWebKitAnimation item (ulong index);-		public ulong length { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMWebKitPoint : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMWebKitPoint ();-		[CCode (cname = "webkit_dom_webkit_point_get_x")]-		public float get_x ();-		[CCode (cname = "webkit_dom_webkit_point_get_y")]-		public float get_y ();-		[CCode (cname = "webkit_dom_webkit_point_set_x")]-		public void set_x (float value);-		[CCode (cname = "webkit_dom_webkit_point_set_y")]-		public void set_y (float value);-		public float x { get; set; }-		public float y { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMXPathExpression : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMXPathExpression ();-		[CCode (cname = "webkit_dom_xpath_expression_evaluate")]-		public unowned WebKit.DOMXPathResult evaluate (WebKit.DOMNode context_node, ushort type, WebKit.DOMXPathResult in_result) throws GLib.Error;-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMXPathNSResolver : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMXPathNSResolver ();-		[CCode (cname = "webkit_dom_xpath_ns_resolver_lookup_namespace_uri")]-		public unowned string lookup_namespace_uri (string prefix);-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class DOMXPathResult : WebKit.DOMObject {-		[CCode (has_construct_function = false)]-		protected DOMXPathResult ();-		[CCode (cname = "webkit_dom_xpath_result_get_boolean_value")]-		public bool get_boolean_value () throws GLib.Error;-		[CCode (cname = "webkit_dom_xpath_result_get_invalid_iterator_state")]-		public bool get_invalid_iterator_state ();-		[CCode (cname = "webkit_dom_xpath_result_get_number_value")]-		public double get_number_value () throws GLib.Error;-		[CCode (cname = "webkit_dom_xpath_result_get_result_type")]-		public ushort get_result_type ();-		[CCode (cname = "webkit_dom_xpath_result_get_single_node_value")]-		public unowned WebKit.DOMNode get_single_node_value () throws GLib.Error;-		[CCode (cname = "webkit_dom_xpath_result_get_snapshot_length")]-		public ulong get_snapshot_length () throws GLib.Error;-		[CCode (cname = "webkit_dom_xpath_result_get_string_value")]-		public unowned string get_string_value () throws GLib.Error;-		[CCode (cname = "webkit_dom_xpath_result_iterate_next")]-		public unowned WebKit.DOMNode iterate_next () throws GLib.Error;-		[CCode (cname = "webkit_dom_xpath_result_snapshot_item")]-		public unowned WebKit.DOMNode snapshot_item (ulong index) throws GLib.Error;-		public bool boolean_value { get; }-		public bool invalid_iterator_state { get; }-		public double number_value { get; }-		public uint result_type { get; }-		public WebKit.DOMNode single_node_value { get; }-		public ulong snapshot_length { get; }-		public string string_value { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class Download : GLib.Object {-		[CCode (has_construct_function = false)]-		public Download (WebKit.NetworkRequest request);-		public void cancel ();-		public uint64 get_current_size ();-		public unowned string get_destination_uri ();-		public double get_elapsed_time ();-		public unowned WebKit.NetworkRequest get_network_request ();-		public unowned WebKit.NetworkResponse get_network_response ();-		public double get_progress ();-		public WebKit.DownloadStatus get_status ();-		public unowned string get_suggested_filename ();-		public uint64 get_total_size ();-		public unowned string get_uri ();-		public void set_destination_uri (string destination_uri);-		public void start ();-		public uint64 current_size { get; }-		public string destination_uri { get; set; }-		public WebKit.NetworkRequest network_request { get; construct; }-		public WebKit.NetworkResponse network_response { get; construct; }-		public double progress { get; }-		public WebKit.DownloadStatus status { get; }-		public string suggested_filename { get; }-		public uint64 total_size { get; }-		public virtual signal bool error (int p0, int p1, string p2);-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class GeolocationPolicyDecision : GLib.Object {-		[CCode (has_construct_function = false)]-		protected GeolocationPolicyDecision ();-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class HitTestResult : GLib.Object {-		[CCode (has_construct_function = false)]-		protected HitTestResult ();-		[NoAccessorMethod]-		public WebKit.HitTestResultContext context { get; construct; }-		[NoAccessorMethod]-		public string image_uri { owned get; construct; }-		[NoAccessorMethod]-		public WebKit.DOMNode inner_node { owned get; construct; }-		[NoAccessorMethod]-		public string link_uri { owned get; construct; }-		[NoAccessorMethod]-		public string media_uri { owned get; construct; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class IconDatabase : GLib.Object {-		[CCode (has_construct_function = false)]-		protected IconDatabase ();-		public void clear ();-		public unowned Gdk.Pixbuf get_icon_pixbuf (string page_uri);-		public unowned string get_icon_uri (string page_uri);-		public unowned string get_path ();-		public void set_path (string path);-		public string path { get; set; }-		public virtual signal void icon_loaded (WebKit.WebFrame p0, string p1);-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class NetworkRequest : GLib.Object {-		[CCode (has_construct_function = false)]-		public NetworkRequest (string uri);-		public unowned Soup.Message get_message ();-		public unowned string get_uri ();-		public void set_uri (string uri);-		public Soup.Message message { get; construct; }-		public string uri { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class NetworkResponse : GLib.Object {-		[CCode (has_construct_function = false)]-		public NetworkResponse (string uri);-		public unowned Soup.Message get_message ();-		public unowned string get_uri ();-		public void set_uri (string uri);-		public Soup.Message message { get; construct; }-		public string uri { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class SecurityOrigin : GLib.Object {-		[CCode (has_construct_function = false)]-		protected SecurityOrigin ();-		public unowned GLib.List<WebKit.WebDatabase> get_all_web_databases ();-		public unowned string get_host ();-		public uint get_port ();-		public unowned string get_protocol ();-		public uint64 get_web_database_quota ();-		public uint64 get_web_database_usage ();-		public void set_web_database_quota (uint64 quota);-		public string host { get; }-		public uint port { get; }-		public string protocol { get; }-		public uint64 web_database_quota { get; set; }-		public uint64 web_database_usage { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class SoupAuthDialog : GLib.Object, Soup.SessionFeature {-		[CCode (has_construct_function = false)]-		protected SoupAuthDialog ();-		public virtual signal unowned Gtk.Widget current_toplevel (Soup.Message message);-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class ViewportAttributes : GLib.Object {-		[CCode (has_construct_function = false)]-		protected ViewportAttributes ();-		public void recompute ();-		[NoAccessorMethod]-		public int available_height { get; set; }-		[NoAccessorMethod]-		public int available_width { get; set; }-		[NoAccessorMethod]-		public int desktop_width { get; set; }-		[NoAccessorMethod]-		public int device_dpi { get; set; }-		[NoAccessorMethod]-		public int device_height { get; set; }-		[NoAccessorMethod]-		public float device_pixel_ratio { get; }-		[NoAccessorMethod]-		public int device_width { get; set; }-		[NoAccessorMethod]-		public int height { get; }-		[NoAccessorMethod]-		public float initial_scale_factor { get; }-		[NoAccessorMethod]-		public float maximum_scale_factor { get; }-		[NoAccessorMethod]-		public float minimum_scale_factor { get; }-		[NoAccessorMethod]-		public bool user_scalable { get; }-		[NoAccessorMethod]-		public bool valid { get; }-		[NoAccessorMethod]-		public int width { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class WebBackForwardList : GLib.Object {-		[CCode (has_construct_function = false)]-		protected WebBackForwardList ();-		public void add_item (WebKit.WebHistoryItem history_item);-		public void clear ();-		public bool contains_item (WebKit.WebHistoryItem history_item);-		public unowned WebKit.WebHistoryItem get_back_item ();-		public int get_back_length ();-		public unowned GLib.List<WebKit.WebHistoryItem> get_back_list_with_limit (int limit);-		public unowned WebKit.WebHistoryItem get_current_item ();-		public unowned WebKit.WebHistoryItem get_forward_item ();-		public int get_forward_length ();-		public unowned GLib.List<WebKit.WebHistoryItem> get_forward_list_with_limit (int limit);-		public int get_limit ();-		public unowned WebKit.WebHistoryItem get_nth_item (int index);-		public void go_back ();-		public void go_forward ();-		public void go_to_item (WebKit.WebHistoryItem history_item);-		public void set_limit (int limit);-		[CCode (has_construct_function = false)]-		public WebBackForwardList.with_web_view (WebKit.WebView web_view);-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class WebDataSource : GLib.Object {-		[CCode (has_construct_function = false)]-		public WebDataSource ();-		public unowned GLib.StringBuilder get_data ();-		public unowned string get_encoding ();-		public unowned WebKit.NetworkRequest get_initial_request ();-		public unowned WebKit.WebResource get_main_resource ();-		public unowned WebKit.NetworkRequest get_request ();-		public unowned GLib.List<WebKit.WebResource> get_subresources ();-		public unowned string get_unreachable_uri ();-		public unowned WebKit.WebFrame get_web_frame ();-		public bool is_loading ();-		[CCode (has_construct_function = false)]-		public WebDataSource.with_request (WebKit.NetworkRequest request);-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class WebDatabase : GLib.Object {-		[CCode (has_construct_function = false)]-		protected WebDatabase ();-		public unowned string get_display_name ();-		public uint64 get_expected_size ();-		public unowned string get_filename ();-		public unowned string get_name ();-		public unowned WebKit.SecurityOrigin get_security_origin ();-		public uint64 get_size ();-		public void remove ();-		public string display_name { get; }-		public uint64 expected_size { get; }-		public string filename { get; }-		public string name { get; construct; }-		public WebKit.SecurityOrigin security_origin { get; construct; }-		public uint64 size { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class WebFrame : GLib.Object {-		[CCode (has_construct_function = false)]-		public WebFrame (WebKit.WebView web_view);-		public unowned WebKit.WebFrame find_frame (string name);-		public unowned WebKit.WebDataSource get_data_source ();-		public Gtk.PolicyType get_horizontal_scrollbar_policy ();-		public WebKit.LoadStatus get_load_status ();-		public unowned string get_name ();-		public unowned WebKit.NetworkResponse get_network_response ();-		public unowned WebKit.WebFrame get_parent ();-		public unowned WebKit.WebDataSource get_provisional_data_source ();-		public unowned WebKit.DOMRange get_range_for_word_around_caret ();-		public unowned WebKit.SecurityOrigin get_security_origin ();-		public unowned string get_title ();-		public unowned string get_uri ();-		public Gtk.PolicyType get_vertical_scrollbar_policy ();-		public unowned WebKit.WebView get_web_view ();-		public void load_alternate_string (string content, string base_url, string unreachable_url);-		public void load_request (WebKit.NetworkRequest request);-		public void load_string (string content, string mime_type, string encoding, string base_uri);-		public void load_uri (string uri);-		public void print ();-		public Gtk.PrintOperationResult print_full (Gtk.PrintOperation operation, Gtk.PrintOperationAction action) throws GLib.Error;-		public void reload ();-		public void replace_selection (string text);-		public void stop_loading ();-		public Gtk.PolicyType horizontal_scrollbar_policy { get; }-		public WebKit.LoadStatus load_status { get; }-		public string name { get; }-		public string title { get; }-		public string uri { get; }-		public Gtk.PolicyType vertical_scrollbar_policy { get; }-		public virtual signal void cleared ();-		public virtual signal void hovering_over_link (string p0, string p1);-		public virtual signal void load_committed ();-		public virtual signal void load_done (bool p0);-		public virtual signal bool scrollbars_policy_changed ();-		public virtual signal void title_changed (string p0);-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class WebHistoryItem : GLib.Object {-		[CCode (has_construct_function = false)]-		public WebHistoryItem ();-		public unowned WebKit.WebHistoryItem copy ();-		public unowned string get_alternate_title ();-		public double get_last_visited_time ();-		public unowned string get_original_uri ();-		public unowned string get_title ();-		public unowned string get_uri ();-		public void set_alternate_title (string title);-		[CCode (has_construct_function = false)]-		public WebHistoryItem.with_data (string uri, string title);-		public string alternate_title { get; set; }-		public double last_visited_time { get; }-		public string original_uri { get; }-		public string title { get; }-		public string uri { get; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class WebInspector : GLib.Object {-		[CCode (has_construct_function = false)]-		protected WebInspector ();-		public void close ();-		public unowned string get_inspected_uri ();-		public unowned WebKit.WebView get_web_view ();-		public void inspect_coordinates (double x, double y);-		public void inspect_node (WebKit.DOMNode node);-		public void show ();-		public string inspected_uri { get; }-		[NoAccessorMethod]-		public bool javascript_profiling_enabled { get; set; }-		[NoAccessorMethod]-		public bool timeline_profiling_enabled { get; set; }-		public WebKit.WebView web_view { get; }-		public virtual signal bool attach_window ();-		public virtual signal bool close_window ();-		public virtual signal bool detach_window ();-		public virtual signal void finished ();-		public virtual signal unowned WebKit.WebView inspect_web_view (WebKit.WebView p0);-		public virtual signal bool show_window ();-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class WebNavigationAction : GLib.Object {-		[CCode (has_construct_function = false)]-		protected WebNavigationAction ();-		public int get_button ();-		public int get_modifier_state ();-		public unowned string get_original_uri ();-		public WebKit.WebNavigationReason get_reason ();-		public unowned string get_target_frame ();-		public void set_original_uri (string originalUri);-		public void set_reason (WebKit.WebNavigationReason reason);-		public int button { get; construct; }-		public int modifier_state { get; construct; }-		public string original_uri { get; set construct; }-		public WebKit.WebNavigationReason reason { get; set construct; }-		public string target_frame { get; construct; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class WebPlugin : GLib.Object {-		[CCode (has_construct_function = false)]-		protected WebPlugin ();-		public unowned string get_description ();-		public bool get_enabled ();-		public unowned GLib.SList get_mimetypes ();-		public unowned string get_name ();-		public unowned string get_path ();-		public void set_enabled (bool p2);-		public bool enabled { get; set; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class WebPluginDatabase : GLib.Object {-		[CCode (has_construct_function = false)]-		protected WebPluginDatabase ();-		public unowned WebKit.WebPlugin get_plugin_for_mimetype (string p2);-		public unowned GLib.SList get_plugins ();-		public static void plugins_list_free (GLib.SList p1);-		public void refresh ();-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	[Compact]-	public class WebPluginMIMEType {-		public weak string description;-		public weak string extensions;-		public weak string name;-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class WebPolicyDecision : GLib.Object {-		[CCode (has_construct_function = false)]-		protected WebPolicyDecision ();-		public void download ();-		public void ignore ();-		public void use ();-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class WebResource : GLib.Object {-		[CCode (has_construct_function = false)]-		public WebResource (string data, ssize_t size, string uri, string mime_type, string encoding, string frame_name);-		public unowned GLib.StringBuilder get_data ();-		public unowned string get_encoding ();-		public unowned string get_frame_name ();-		public unowned string get_mime_type ();-		public unowned string get_uri ();-		public string encoding { get; }-		public string frame_name { get; }-		public string mime_type { get; }-		public string uri { get; construct; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class WebSettings : GLib.Object {-		[CCode (has_construct_function = false)]-		public WebSettings ();-		public WebKit.WebSettings copy ();-		public unowned string get_user_agent ();-		[NoAccessorMethod]-		public bool auto_load_images { get; set construct; }-		[NoAccessorMethod]-		public bool auto_resize_window { get; set construct; }-		[NoAccessorMethod]-		public bool auto_shrink_images { get; set construct; }-		[NoAccessorMethod]-		public string cursive_font_family { owned get; set construct; }-		[NoAccessorMethod]-		public string default_encoding { owned get; set construct; }-		[NoAccessorMethod]-		public string default_font_family { owned get; set construct; }-		[NoAccessorMethod]-		public int default_font_size { get; set construct; }-		[NoAccessorMethod]-		public int default_monospace_font_size { get; set construct; }-		[NoAccessorMethod]-		public WebKit.EditingBehavior editing_behavior { get; set construct; }-		[NoAccessorMethod]-		public bool enable_caret_browsing { get; set construct; }-		[NoAccessorMethod]-		public bool enable_default_context_menu { get; set construct; }-		[NoAccessorMethod]-		public bool enable_developer_extras { get; set construct; }-		[NoAccessorMethod]-		public bool enable_dns_prefetching { get; set construct; }-		[NoAccessorMethod]-		public bool enable_dom_paste { get; set construct; }-		[NoAccessorMethod]-		public bool enable_file_access_from_file_uris { get; set construct; }-		[NoAccessorMethod]-		public bool enable_frame_flattening { get; set construct; }-		[NoAccessorMethod]-		public bool enable_fullscreen { get; set construct; }-		[NoAccessorMethod]-		public bool enable_html5_database { get; set construct; }-		[NoAccessorMethod]-		public bool enable_html5_local_storage { get; set construct; }-		[NoAccessorMethod]-		public bool enable_hyperlink_auditing { get; set construct; }-		[NoAccessorMethod]-		public bool enable_java_applet { get; set construct; }-		[NoAccessorMethod]-		public bool enable_offline_web_application_cache { get; set construct; }-		[NoAccessorMethod]-		public bool enable_page_cache { get; set construct; }-		[NoAccessorMethod]-		public bool enable_plugins { get; set construct; }-		[NoAccessorMethod]-		public bool enable_private_browsing { get; set construct; }-		[NoAccessorMethod]-		public bool enable_scripts { get; set construct; }-		[NoAccessorMethod]-		public bool enable_site_specific_quirks { get; set construct; }-		[NoAccessorMethod]-		public bool enable_spatial_navigation { get; set construct; }-		[NoAccessorMethod]-		public bool enable_spell_checking { get; set construct; }-		[NoAccessorMethod]-		public bool enable_universal_access_from_file_uris { get; set construct; }-		[NoAccessorMethod]-		public bool enable_webgl { get; set construct; }-		[NoAccessorMethod]-		public bool enable_xss_auditor { get; set construct; }-		[NoAccessorMethod]-		public bool enforce_96_dpi { get; set construct; }-		[NoAccessorMethod]-		public string fantasy_font_family { owned get; set construct; }-		[NoAccessorMethod]-		public string html5_local_storage_database_path { owned get; set construct; }-		[NoAccessorMethod]-		public bool javascript_can_access_clipboard { get; set construct; }-		[NoAccessorMethod]-		public bool javascript_can_open_windows_automatically { get; set construct; }-		[NoAccessorMethod]-		public int minimum_font_size { get; set construct; }-		[NoAccessorMethod]-		public int minimum_logical_font_size { get; set construct; }-		[NoAccessorMethod]-		public string monospace_font_family { owned get; set construct; }-		[NoAccessorMethod]-		public bool print_backgrounds { get; set construct; }-		[NoAccessorMethod]-		public bool resizable_text_areas { get; set construct; }-		[NoAccessorMethod]-		public string sans_serif_font_family { owned get; set construct; }-		[NoAccessorMethod]-		public string serif_font_family { owned get; set construct; }-		[NoAccessorMethod]-		public string spell_checking_languages { owned get; set construct; }-		[NoAccessorMethod]-		public bool tab_key_cycles_through_elements { get; set construct; }-		[NoAccessorMethod]-		public string user_agent { owned get; set construct; }-		[NoAccessorMethod]-		public string user_stylesheet_uri { owned get; set construct; }-		[NoAccessorMethod]-		public float zoom_step { get; set construct; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class WebView : Gtk.Container, Atk.Implementor, Gtk.Buildable {-		[CCode (has_construct_function = false, type = "GtkWidget*")]-		public WebView ();-		public bool can_copy_clipboard ();-		public bool can_cut_clipboard ();-		public bool can_go_back ();-		public bool can_go_back_or_forward (int steps);-		public bool can_go_forward ();-		public bool can_paste_clipboard ();-		public bool can_redo ();-		public bool can_show_mime_type (string mime_type);-		public bool can_undo ();-		[NoWrapper]-		public virtual unowned string choose_file (WebKit.WebFrame frame, string old_file);-		public void delete_selection ();-		public void execute_script (string script);-		public unowned WebKit.WebBackForwardList get_back_forward_list ();-		public unowned Gtk.TargetList get_copy_target_list ();-		public unowned string get_custom_encoding ();-		public unowned WebKit.DOMDocument get_dom_document ();-		public bool get_editable ();-		public unowned string get_encoding ();-		public unowned WebKit.WebFrame get_focused_frame ();-		public bool get_full_content_zoom ();-		public unowned WebKit.HitTestResult get_hit_test_result (Gdk.EventButton event);-		public unowned Gdk.Pixbuf get_icon_pixbuf ();-		public unowned string get_icon_uri ();-		public unowned WebKit.WebInspector get_inspector ();-		public WebKit.LoadStatus get_load_status ();-		public unowned WebKit.WebFrame get_main_frame ();-		public unowned Gtk.TargetList get_paste_target_list ();-		public double get_progress ();-		public unowned WebKit.WebSettings get_settings ();-		public unowned string get_title ();-		public bool get_transparent ();-		public unowned string get_uri ();-		public WebKit.WebViewViewMode get_view_mode ();-		public bool get_view_source_mode ();-		public unowned WebKit.ViewportAttributes get_viewport_attributes ();-		public unowned WebKit.WebWindowFeatures get_window_features ();-		public float get_zoom_level ();-		public void go_back ();-		public void go_back_or_forward (int steps);-		public void go_forward ();-		public bool go_to_back_forward_item (WebKit.WebHistoryItem item);-		public bool has_selection ();-		public void load_html_string (string content, string base_uri);-		public void load_request (WebKit.NetworkRequest request);-		public void load_string (string content, string mime_type, string encoding, string base_uri);-		public void load_uri (string uri);-		public uint mark_text_matches (string str, bool case_sensitive, uint limit);-		public void open (string uri);-		public void reload ();-		public void reload_bypass_cache ();-		public bool search_text (string text, bool case_sensitive, bool forward, bool wrap);-		public void set_custom_encoding (string encoding);-		public void set_editable (bool flag);-		public void set_full_content_zoom (bool full_content_zoom);-		public void set_highlight_text_matches (bool highlight);-		public void set_maintains_back_forward_list (bool flag);-		public void set_settings (WebKit.WebSettings settings);-		public void set_transparent (bool flag);-		public void set_view_mode (WebKit.WebViewViewMode mode);-		public void set_view_source_mode (bool view_source_mode);-		public void set_zoom_level (float zoom_level);-		[NoWrapper]-		public virtual bool should_allow_editing_action ();-		public void stop_loading ();-		public void unmark_text_matches ();-		public void zoom_in ();-		public void zoom_out ();-		public Gtk.TargetList copy_target_list { get; }-		public string custom_encoding { get; set; }-		public bool editable { get; set; }-		public string encoding { get; }-		public bool full_content_zoom { get; set; }-		public string icon_uri { get; }-		[NoAccessorMethod]-		public Gtk.IMContext im_context { owned get; }-		public WebKit.LoadStatus load_status { get; }-		public Gtk.TargetList paste_target_list { get; }-		public double progress { get; }-		[NoAccessorMethod]-		public bool self_scrolling { get; construct; }-		public WebKit.WebSettings settings { get; set; }-		public string title { get; }-		public bool transparent { get; set; }-		public string uri { get; }-		public WebKit.WebViewViewMode view_mode { get; set; }-		public WebKit.ViewportAttributes viewport_attributes { get; }-		[NoAccessorMethod]-		public WebKit.WebInspector web_inspector { owned get; }-		[NoAccessorMethod]-		public WebKit.WebWindowFeatures window_features { owned get; set; }-		public float zoom_level { get; set; }-		public virtual signal bool close_web_view ();-		public virtual signal bool console_message (string message, int line_number, string source_id);-		[HasEmitter]-		public virtual signal void copy_clipboard ();-		public virtual signal unowned Gtk.Widget create_plugin_widget (string p0, string p1, GLib.HashTable p2);-		public virtual signal WebKit.WebView create_web_view (WebKit.WebFrame web_frame);-		[HasEmitter]-		public virtual signal void cut_clipboard ();-		public virtual signal void database_quota_exceeded (GLib.Object p0, GLib.Object p1);-		public virtual signal void document_load_finished (WebKit.WebFrame p0);-		public virtual signal bool download_requested (GLib.Object p0);-		public virtual signal void editing_began ();-		public virtual signal void editing_ended ();-		public virtual signal void frame_created (WebKit.WebFrame p0);-		public virtual signal void geolocation_policy_decision_cancelled (WebKit.WebFrame p0);-		public virtual signal bool geolocation_policy_decision_requested (WebKit.WebFrame p0, WebKit.GeolocationPolicyDecision p1);-		public virtual signal void hovering_over_link (string? p0, string? p1);-		public virtual signal void icon_loaded (string p0);-		public virtual signal void load_committed (WebKit.WebFrame p0);-		public virtual signal bool load_error (WebKit.WebFrame p0, string p1, GLib.Error p2);-		public virtual signal void load_finished (WebKit.WebFrame p0);-		public virtual signal void load_progress_changed (int p0);-		public virtual signal void load_started (WebKit.WebFrame p0);-		public virtual signal bool mime_type_policy_decision_requested (WebKit.WebFrame p0, WebKit.NetworkRequest p1, string p2, WebKit.WebPolicyDecision p3);-		[HasEmitter]-		public virtual signal bool move_cursor (Gtk.MovementStep step, int count);-		public virtual signal bool navigation_policy_decision_requested (WebKit.WebFrame p0, WebKit.NetworkRequest p1, WebKit.WebNavigationAction p2, WebKit.WebPolicyDecision p3);-		public virtual signal WebKit.NavigationResponse navigation_requested (WebKit.WebFrame frame, WebKit.NetworkRequest request);-		public virtual signal bool new_window_policy_decision_requested (WebKit.WebFrame p0, WebKit.NetworkRequest p1, WebKit.WebNavigationAction p2, WebKit.WebPolicyDecision p3);-		public virtual signal void onload_event (WebKit.WebFrame p0);-		[HasEmitter]-		public virtual signal void paste_clipboard ();-		public virtual signal void populate_popup (Gtk.Menu p0);-		public virtual signal bool print_requested (WebKit.WebFrame p0);-		[HasEmitter]-		public virtual signal void redo ();-		public virtual signal void resource_request_starting (WebKit.WebFrame p0, WebKit.WebResource p1, WebKit.NetworkRequest p2, WebKit.NetworkResponse p3);-		public virtual signal bool script_alert (WebKit.WebFrame frame, string alert_message);-		public virtual signal bool script_confirm (WebKit.WebFrame frame, string confirm_message, void* did_confirm);-		public virtual signal bool script_prompt (WebKit.WebFrame frame, string message, string default_value, void* value);-		[HasEmitter]-		public virtual signal void select_all ();-		public virtual signal void selection_changed ();-		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);-		public virtual signal bool should_apply_style (WebKit.DOMCSSStyleDeclaration p0, WebKit.DOMRange p1);-		public virtual signal bool should_begin_editing (WebKit.DOMRange p0);-		public virtual signal bool should_change_selected_range (WebKit.DOMRange p0, WebKit.DOMRange p1, WebKit.SelectionAffinity p2, bool p3);-		public virtual signal bool should_delete_range (WebKit.DOMRange p0);-		public virtual signal bool should_end_editing (WebKit.DOMRange p0);-		public virtual signal bool should_insert_node (WebKit.DOMNode p0, WebKit.DOMRange p1, WebKit.InsertAction p2);-		public virtual signal bool should_insert_text (string p0, WebKit.DOMRange p1, WebKit.InsertAction p2);-		public virtual signal bool should_show_delete_interface_for_element (WebKit.DOMHTMLElement p0);-		public virtual signal void status_bar_text_changed (string p0);-		public virtual signal void title_changed (WebKit.WebFrame p0, string p1);-		[HasEmitter]-		public virtual signal void undo ();-		public virtual signal void user_changed_contents ();-		public virtual signal void viewport_attributes_changed (WebKit.ViewportAttributes p0);-		public virtual signal void viewport_attributes_recompute_requested (WebKit.ViewportAttributes p0);-		public virtual signal bool web_view_ready ();-		public virtual signal void window_object_cleared (WebKit.WebFrame frame, void* context, void* window_object);-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public class WebWindowFeatures : GLib.Object {-		[CCode (has_construct_function = false)]-		public WebWindowFeatures ();-		public bool equal (WebKit.WebWindowFeatures features2);-		[NoAccessorMethod]-		public bool fullscreen { get; set construct; }-		[NoAccessorMethod]-		public int height { get; set construct; }-		[NoAccessorMethod]-		public bool locationbar_visible { get; set construct; }-		[NoAccessorMethod]-		public bool menubar_visible { get; set construct; }-		[NoAccessorMethod]-		public bool scrollbar_visible { get; set construct; }-		[NoAccessorMethod]-		public bool statusbar_visible { get; set construct; }-		[NoAccessorMethod]-		public bool toolbar_visible { get; set construct; }-		[NoAccessorMethod]-		public int width { get; set construct; }-		[NoAccessorMethod]-		public int x { get; set construct; }-		[NoAccessorMethod]-		public int y { get; set construct; }-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public interface DOMEventTarget : GLib.Object {-		public abstract bool add_event_listener (string eventName, GLib.Callback handler, bool bubble, void* userData);-		public abstract void dispatch_event (WebKit.DOMEvent event) throws GLib.Error;-		public abstract bool remove_event_listener (string eventName, GLib.Callback handler, bool bubble);-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public interface SpellChecker : GLib.Object {-		public abstract void check_spelling_of_string (string str, int misspelling_location, int misspelling_length);-		public abstract unowned string get_autocorrect_suggestions_for_misspelled_word (string word);-		public abstract unowned string get_guesses_for_word (string word, string context);-		public abstract void ignore_word (string word);-		public abstract void learn_word (string word);-		public abstract void update_spell_checking_languages (string languages);-	}-	[CCode (cheader_filename = "webkit/webkit.h", cprefix = "WEBKIT_CACHE_MODEL_")]-	public enum CacheModel {-		DEFAULT,-		DOCUMENT_VIEWER,-		WEB_BROWSER,-		DOCUMENT_BROWSER-	}-	[CCode (cheader_filename = "webkit/webkit.h", cprefix = "WEBKIT_DOWNLOAD_ERROR_")]-	public enum DownloadError {-		CANCELLED_BY_USER,-		DESTINATION,-		NETWORK-	}-	[CCode (cheader_filename = "webkit/webkit.h", cprefix = "WEBKIT_DOWNLOAD_STATUS_")]-	public enum DownloadStatus {-		ERROR,-		CREATED,-		STARTED,-		CANCELLED,-		FINISHED-	}-	[CCode (cheader_filename = "webkit/webkit.h", cprefix = "WEBKIT_EDITING_BEHAVIOR_")]-	public enum EditingBehavior {-		MAC,-		WINDOWS,-		UNIX-	}-	[CCode (cheader_filename = "webkit/webkit.h", cprefix = "WEBKIT_HIT_TEST_RESULT_CONTEXT_")]-	[Flags]-	public enum HitTestResultContext {-		DOCUMENT,-		LINK,-		IMAGE,-		MEDIA,-		SELECTION,-		EDITABLE-	}-	[CCode (cheader_filename = "webkit/webkit.h", cprefix = "WEBKIT_INSERT_ACTION_")]-	public enum InsertAction {-		TYPED,-		PASTED,-		DROPPED-	}-	[CCode (cheader_filename = "webkit/webkit.h", cprefix = "WEBKIT_LOAD_")]-	public enum LoadStatus {-		PROVISIONAL,-		COMMITTED,-		FINISHED,-		FIRST_VISUALLY_NON_EMPTY_LAYOUT,-		FAILED-	}-	[CCode (cheader_filename = "webkit/webkit.h", cprefix = "WEBKIT_NAVIGATION_RESPONSE_")]-	public enum NavigationResponse {-		ACCEPT,-		IGNORE,-		DOWNLOAD-	}-	[CCode (cheader_filename = "webkit/webkit.h", cprefix = "WEBKIT_NETWORK_ERROR_")]-	public enum NetworkError {-		FAILED,-		TRANSPORT,-		UNKNOWN_PROTOCOL,-		CANCELLED,-		FILE_DOES_NOT_EXIST-	}-	[CCode (cheader_filename = "webkit/webkit.h", cprefix = "WEBKIT_PLUGIN_ERROR_")]-	public enum PluginError {-		FAILED,-		CANNOT_FIND_PLUGIN,-		CANNOT_LOAD_PLUGIN,-		JAVA_UNAVAILABLE,-		CONNECTION_CANCELLED,-		WILL_HANDLE_LOAD-	}-	[CCode (cheader_filename = "webkit/webkit.h", cprefix = "WEBKIT_POLICY_ERROR_")]-	public enum PolicyError {-		FAILED,-		CANNOT_SHOW_MIME_TYPE,-		CANNOT_SHOW_URL,-		FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE,-		CANNOT_USE_RESTRICTED_PORT-	}-	[CCode (cheader_filename = "webkit/webkit.h", cprefix = "WEBKIT_SELECTION_AFFINITY_")]-	public enum SelectionAffinity {-		UPSTREAM,-		DOWNSTREAM-	}-	[CCode (cheader_filename = "webkit/webkit.h", cprefix = "WEBKIT_WEB_NAVIGATION_REASON_")]-	public enum WebNavigationReason {-		LINK_CLICKED,-		FORM_SUBMITTED,-		BACK_FORWARD,-		RELOAD,-		FORM_RESUBMITTED,-		OTHER-	}-	[CCode (cheader_filename = "webkit/webkit.h", cprefix = "WEBKIT_WEB_VIEW_TARGET_INFO_")]-	public enum WebViewTargetInfo {-		HTML,-		TEXT,-		IMAGE,-		URI_LIST,-		NETSCAPE_URL-	}-	[CCode (cheader_filename = "webkit/webkit.h", cprefix = "WEBKIT_WEB_VIEW_VIEW_MODE_")]-	public enum WebViewViewMode {-		WINDOWED,-		FLOATING,-		FULLSCREEN,-		MAXIMIZED,-		MINIMIZED-	}-	[CCode (cheader_filename = "webkit/webkit.h")]-	public const int MAJOR_VERSION;-	[CCode (cheader_filename = "webkit/webkit.h")]-	public const int MICRO_VERSION;-	[CCode (cheader_filename = "webkit/webkit.h")]-	public const int MINOR_VERSION;-	[CCode (cheader_filename = "webkit/webkit.h")]-	public const int USER_AGENT_MAJOR_VERSION;-	[CCode (cheader_filename = "webkit/webkit.h")]-	public const int USER_AGENT_MINOR_VERSION;-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static unowned string application_cache_get_database_directory_path ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static uint application_cache_get_maximum_size ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static void application_cache_set_maximum_size (uint size);-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static bool check_version (uint major, uint minor, uint micro);-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static void geolocation_policy_allow (WebKit.GeolocationPolicyDecision decision);-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static void geolocation_policy_deny (WebKit.GeolocationPolicyDecision decision);-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static WebKit.CacheModel get_cache_model ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static unowned Soup.Session get_default_session ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static uint64 get_default_web_database_quota ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static unowned WebKit.IconDatabase get_icon_database ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static unowned GLib.Object get_text_checker ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static unowned string get_web_database_directory_path ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static unowned WebKit.WebPluginDatabase get_web_plugin_database ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static uint major_version ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static uint micro_version ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static uint minor_version ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static GLib.Quark network_error_quark ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static GLib.Quark plugin_error_quark ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static GLib.Quark policy_error_quark ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static void remove_all_web_databases ();-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static void set_cache_model (WebKit.CacheModel cache_model);-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static void set_default_web_database_quota (uint64 defaultQuota);-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static void set_text_checker (GLib.Object checker);-	[CCode (cheader_filename = "webkit/webkit.h")]-	public static void set_web_database_directory_path (string path);-}

Contact

Email: johan.mattsson.m@gmail.com
Mastodon: typo.social/@birdfont
GitHub: johanmattssonm
LinkedIn: johan-mattsson-2ab324112