Initial english translation.

6 files changed, 346 insertions, 270 deletions

diff --git a/translations.qrc b/locale.qrc
index cdbabdf..cdbabdf 100644
--- a/translations.qrc
+++ b/locale.qrc
diff --git a/locale/symedit.en_GB.ts b/locale/symedit.en_GB.ts
index 8f92358..c6a0051 100644
--- a/locale/symedit.en_GB.ts
+++ b/locale/symedit.en_GB.ts
@@ -3,291 +3,315 @@
 <TS version="2.1" language="en_GB">
 <context>
     <name></name>
-    <message id="Symbol editor">
+    <message id="id_application_title">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Symbol Editor</translation>
     </message>
     <message id="id_menu_file">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>File</translation>
     </message>
     <message id="id_menu_file_open">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Open...</translation>
     </message>
     <message id="id_menu_file_save">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Save...</translation>
     </message>
     <message id="id_menu_file_exit">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Exit</translation>
     </message>
     <message id="id_menu_edit">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Edit</translation>
     </message>
     <message id="id_menu_edit_undo">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Undo</translation>
     </message>
     <message id="id_menu_edit_redo">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Redo</translation>
     </message>
     <message id="id_menu_edit_cut">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Cut</translation>
     </message>
     <message id="id_menu_edit_copy">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Copy</translation>
     </message>
     <message id="id_menu_edit_paste">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Paste</translation>
     </message>
     <message id="id_menu_edit_rotate_right">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Rotate Right</translation>
     </message>
     <message id="id_menu_edit_rotate_left">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Rotate Left</translation>
     </message>
     <message id="id_menu_edit_raise_item">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Raise Item</translation>
     </message>
     <message id="id_menu_edit_lower_item">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Lower Item</translation>
     </message>
     <message id="id_menu_edit_delete_item">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Delete Item</translation>
     </message>
     <message id="id_menu_view">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>View</translation>
     </message>
     <message id="id_menu_view_zoom_in">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Zoom In</translation>
     </message>
     <message id="id_menu_view_zoom_out">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Zoom Out</translation>
     </message>
     <message id="id_menu_view_zoom_all">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Zoom Out</translation>
     </message>
     <message id="id_menu_view_grid">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Show Grid</translation>
     </message>
     <message id="id_menu_view_preview">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Preview</translation>
     </message>
     <message id="id_menu_tool">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Tool</translation>
     </message>
-    <message id="Select">
+    <message id="id_menu_tool_select">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Select</translation>
     </message>
-    <message id="Line">
+    <message id="id_menu_tool_line">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Line</translation>
     </message>
-    <message id="Rectangle Corner">
+    <message id="id_menu_tool_rect_corner">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Rectangle Corner</translation>
     </message>
-    <message id="Rectangle Center">
+    <message id="id_menu_tool_rect_center">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Rectangle Center</translation>
     </message>
-    <message id="Circle Corner">
+    <message id="id_menu_tool_circle_corner">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Circle Corner</translation>
     </message>
-    <message id="Circle Radius">
+    <message id="id_menu_tool_circle_radius">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Circle Radius</translation>
     </message>
-    <message id="Circle Center">
+    <message id="id_menu_tool_circle_center">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Circle Center</translation>
     </message>
-    <message id="Semicircle">
+    <message id="id_menu_tool_arc_semi">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Semicircle</translation>
     </message>
-    <message id="Quarter circle">
+    <message id="id_menu_tool_arc_quarter">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Quarter Circle</translation>
     </message>
-    <message id="Text">
+    <message id="id_menu_tool_text">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Text</translation>
     </message>
-    <message id="Help">
+    <message id="id_menu_help">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Help</translation>
     </message>
-    <message id="About">
+    <message id="id_menu_help_help">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Help</translation>
     </message>
-    <message id="Undo Edit">
+    <message id="id_menu_about">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>About</translation>
     </message>
-    <message id="Redo Edit">
+    <message id="id_tooltip_edit_undo">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Cut Symbol">
+    <message id="id_tooltip_edit_redo">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Copy Symbol">
+    <message id="id_tooltip_edit_cut">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Paste symbol">
+    <message id="id_tooltip_edit_copyl">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Rotate right">
+    <message id="id_tooltip_edit_paste">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Rotate left">
+    <message id="id_tooltip_edit_rotate_right">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Raise item">
+    <message id="id_tooltip_edit_rotate_left">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Lower item">
+    <message id="id_tooltip_edit_raise_item">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Delete item">
+    <message id="id_tooltip_edit_lower_item">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Preview">
+    <message id="id_tooltip_delete_raise_item">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Select item">
+    <message id="id_tooltip_zoom_preview">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Straight Line">
+    <message id="id_tooltip_tool_select">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Rectangle Corners">
+    <message id="id_tooltip_tool_line">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Text String">
+    <message id="id_tooltip_tool_rect_corner">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Snap">
+    <message id="id_tooltip_tool_rect_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Fill">
+    <message id="id_tooltip_tool_circle_corner">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="0    No fill">
+    <message id="id_tooltip_tool_circle_radius">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="1    Backgroud">
+    <message id="id_tooltip_tool_circle_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="2    Area fill">
+    <message id="id_tooltip_tool_text">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Line width">
+    <message id="id_toolbar_snap_grid">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Snap Grid</translation>
     </message>
-    <message id="Text size">
+    <message id="id_toolbar_fill_item">
+        <source></source>
+		<translation>Fill Item</translation>
+    </message>
+    <message id="id_toolbar_fill_none">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Alignment">
+    <message id="id_toolbar_fill_back">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="1     Top Right">
+    <message id="id_toolbar_fill_area">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="2     Top Center">
+    <message id="id_toolbar_line_width">
+        <source></source>
+		<translation>Line Width</translation>
+    </message>
+    <message id="id_toolbar_text_size">
+        <source></source>
+		<translation>Text Size</translation>
+    </message>
+    <message id="id_toolbar_alignment">
+        <source></source>
+		<translation>Alignment</translation>
+    </message>
+    <message id="id_toolbar_align_top_right">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="3     Top Left">
+    <message id="id_toolbar_align_top_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="4     Base Right">
+    <message id="id_toolbar_align_top_left">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="5     Base Center">
+    <message id="id_toolbar_align_base_right">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="6     Base Left">
+    <message id="id_toolbar_align_base_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="7     Bottom Right">
+    <message id="id_toolbar_align_base_left">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="8     Bottom Center">
+    <message id="id_toolbar_align_bottom_right">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="9     Bottom Left">
+    <message id="id_toolbar_align_bottom_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="10    Middle Right">
+    <message id="id_toolbar_align_bottom_left">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="11    Middle Center">
+    <message id="id_toolbar_align_middle_right">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="12    Middle Left">
+    <message id="id_toolbar_align_middle_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id-toolbar-text">
+    <message id="id_toolbar_align_middle_left">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id-help-about-text">
+    <message id="id_toolbar_text_field">
+        <source></source>
+		<translation>Text</translation>
+    </message>
+    <message id="id_dialog_about">
+        <source></source>
+		<translation>About Symbol Editor</translation>
+    </message>
+    <message id="id_dialog_about_text">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/locale/symedit.fi_FI.ts b/locale/symedit.fi_FI.ts
index fca4a94..fe2c5c0 100644
--- a/locale/symedit.fi_FI.ts
+++ b/locale/symedit.fi_FI.ts
@@ -3,9 +3,9 @@
 <TS version="2.1" language="fi_FI">
 <context>
     <name></name>
-    <message id="Symbol editor">
+    <message id="id_application_title">
         <source></source>
-        <translation type="unfinished"></translation>
+		<translation>Symbolieditori</translation>
     </message>
     <message id="id_menu_file">
         <source></source>
@@ -95,199 +95,223 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Select">
+    <message id="id_menu_tool_select">
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="id_menu_tool_line">
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="id_menu_tool_rect_corner">
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="id_menu_tool_rect_center">
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="id_menu_tool_circle_corner">
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="id_menu_tool_circle_radius">
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="id_menu_tool_circle_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Line">
+    <message id="id_menu_tool_arc_semi">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Rectangle Corner">
+    <message id="id_menu_tool_arc_quarter">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Rectangle Center">
+    <message id="id_menu_tool_text">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Circle Corner">
+    <message id="id_menu_help">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Circle Radius">
+    <message id="id_menu_help_help">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Circle Center">
+    <message id="id_menu_about">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Semicircle">
+    <message id="id_tooltip_edit_undo">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Quarter circle">
+    <message id="id_tooltip_edit_redo">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Text">
+    <message id="id_tooltip_edit_cut">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Help">
+    <message id="id_tooltip_edit_copyl">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="About">
+    <message id="id_tooltip_edit_paste">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Undo Edit">
+    <message id="id_tooltip_edit_rotate_right">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Redo Edit">
+    <message id="id_tooltip_edit_rotate_left">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Cut Symbol">
+    <message id="id_tooltip_edit_raise_item">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Copy Symbol">
+    <message id="id_tooltip_edit_lower_item">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Paste symbol">
+    <message id="id_tooltip_delete_raise_item">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Rotate right">
+    <message id="id_tooltip_zoom_preview">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Rotate left">
+    <message id="id_tooltip_tool_select">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Raise item">
+    <message id="id_tooltip_tool_line">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Lower item">
+    <message id="id_tooltip_tool_rect_corner">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Delete item">
+    <message id="id_tooltip_tool_rect_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Preview">
+    <message id="id_tooltip_tool_circle_corner">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Select item">
+    <message id="id_tooltip_tool_circle_radius">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Straight Line">
+    <message id="id_tooltip_tool_circle_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Rectangle Corners">
+    <message id="id_tooltip_tool_text">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Text String">
+    <message id="id_toolbar_snap_grid">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Snap">
+    <message id="id_toolbar_fill_item">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Fill">
+    <message id="id_toolbar_fill_none">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="0    No fill">
+    <message id="id_toolbar_fill_back">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="1    Backgroud">
+    <message id="id_toolbar_fill_area">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="2    Area fill">
+    <message id="id_toolbar_line_width">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Line width">
+    <message id="id_toolbar_text_size">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Text size">
+    <message id="id_toolbar_alignment">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Alignment">
+    <message id="id_toolbar_align_top_right">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="1     Top Right">
+    <message id="id_toolbar_align_top_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="2     Top Center">
+    <message id="id_toolbar_align_top_left">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="3     Top Left">
+    <message id="id_toolbar_align_base_right">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="4     Base Right">
+    <message id="id_toolbar_align_base_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="5     Base Center">
+    <message id="id_toolbar_align_base_left">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="6     Base Left">
+    <message id="id_toolbar_align_bottom_right">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="7     Bottom Right">
+    <message id="id_toolbar_align_bottom_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="8     Bottom Center">
+    <message id="id_toolbar_align_bottom_left">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="9     Bottom Left">
+    <message id="id_toolbar_align_middle_right">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="10    Middle Right">
+    <message id="id_toolbar_align_middle_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="11    Middle Center">
+    <message id="id_toolbar_align_middle_left">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="12    Middle Left">
+    <message id="id_toolbar_text_field">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id-toolbar-text">
+    <message id="id_dialog_about">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id-help-about-text">
+    <message id="id_dialog_about_text">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/locale/symedit.ts b/locale/symedit.ts
index a5e4e8c..acf2d9b 100644
--- a/locale/symedit.ts
+++ b/locale/symedit.ts
@@ -3,291 +3,315 @@
 <TS version="2.1">
 <context>
     <name></name>
-    <message id="Symbol editor">
+    <message id="id_menu_file">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Preview">
+    <message id="id_menu_file_open">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Select">
+    <message id="id_menu_file_save">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Line">
+    <message id="id_menu_file_exit">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Rectangle Corner">
+    <message id="id_menu_edit">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Rectangle Center">
+    <message id="id_menu_edit_undo">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Circle Corner">
+    <message id="id_menu_edit_redo">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Circle Radius">
+    <message id="id_menu_edit_cut">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Circle Center">
+    <message id="id_menu_edit_copy">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Semicircle">
+    <message id="id_menu_edit_paste">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Quarter circle">
+    <message id="id_menu_edit_rotate_right">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Text">
+    <message id="id_menu_edit_rotate_left">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Help">
+    <message id="id_menu_edit_raise_item">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="About">
+    <message id="id_menu_edit_lower_item">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Undo Edit">
+    <message id="id_menu_edit_delete_item">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Redo Edit">
+    <message id="id_menu_view">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Cut Symbol">
+    <message id="id_menu_view_zoom_in">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Copy Symbol">
+    <message id="id_menu_view_zoom_out">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Paste symbol">
+    <message id="id_menu_view_zoom_all">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Rotate right">
+    <message id="id_menu_view_grid">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Rotate left">
+    <message id="id_menu_view_preview">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Raise item">
+    <message id="id_menu_tool">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Lower item">
+    <message id="id_menu_tool_select">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Delete item">
+    <message id="id_menu_tool_line">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Select item">
+    <message id="id_menu_tool_rect_corner">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Straight Line">
+    <message id="id_menu_tool_rect_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Rectangle Corners">
+    <message id="id_menu_tool_circle_corner">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Text String">
+    <message id="id_menu_tool_circle_radius">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Snap">
+    <message id="id_menu_tool_circle_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Fill">
+    <message id="id_menu_tool_arc_semi">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="0    No fill">
+    <message id="id_menu_tool_arc_quarter">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="1    Backgroud">
+    <message id="id_menu_tool_text">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="2    Area fill">
+    <message id="id_menu_help">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Line width">
+    <message id="id_menu_help_help">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Text size">
+    <message id="id_menu_about">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="Alignment">
+    <message id="id_tooltip_edit_undo">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="1     Top Right">
+    <message id="id_tooltip_edit_redo">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="2     Top Center">
+    <message id="id_tooltip_edit_cut">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="3     Top Left">
+    <message id="id_tooltip_edit_copyl">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="4     Base Right">
+    <message id="id_tooltip_edit_paste">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="5     Base Center">
+    <message id="id_tooltip_edit_rotate_right">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="6     Base Left">
+    <message id="id_tooltip_edit_rotate_left">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="7     Bottom Right">
+    <message id="id_tooltip_edit_raise_item">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="8     Bottom Center">
+    <message id="id_tooltip_edit_lower_item">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="9     Bottom Left">
+    <message id="id_tooltip_delete_raise_item">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="10    Middle Right">
+    <message id="id_tooltip_zoom_preview">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="11    Middle Center">
+    <message id="id_tooltip_tool_select">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="12    Middle Left">
+    <message id="id_tooltip_tool_line">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id-toolbar-text">
+    <message id="id_tooltip_tool_rect_corner">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id-help-about-text">
+    <message id="id_tooltip_tool_rect_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_file">
+    <message id="id_tooltip_tool_circle_corner">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_file_open">
+    <message id="id_tooltip_tool_circle_radius">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_file_save">
+    <message id="id_tooltip_tool_circle_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_file_exit">
+    <message id="id_tooltip_tool_text">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_edit">
+    <message id="id_toolbar_fill_item">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_edit_undo">
+    <message id="id_toolbar_line_width">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_edit_redo">
+    <message id="id_toolbar_text_size">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_edit_cut">
+    <message id="id_toolbar_alignment">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_edit_copy">
+    <message id="id_toolbar_text_field">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_edit_paste">
+    <message id="id_dialog_about">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_edit_rotate_right">
+    <message id="id_dialog_about_text">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_edit_rotate_left">
+    <message id="id_application_title">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_edit_raise_item">
+    <message id="id_toolbar_snap_grid">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_edit_lower_item">
+    <message id="id_toolbar_fill_none">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_edit_delete_item">
+    <message id="id_toolbar_fill_back">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_view">
+    <message id="id_toolbar_fill_area">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_view_zoom_in">
+    <message id="id_toolbar_align_top_right">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_view_zoom_out">
+    <message id="id_toolbar_align_top_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_view_zoom_all">
+    <message id="id_toolbar_align_top_left">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_view_grid">
+    <message id="id_toolbar_align_base_right">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_view_preview">
+    <message id="id_toolbar_align_base_center">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_menu_tool">
+    <message id="id_toolbar_align_base_left">
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="id_toolbar_align_bottom_right">
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="id_toolbar_align_bottom_center">
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="id_toolbar_align_bottom_left">
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="id_toolbar_align_middle_right">
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="id_toolbar_align_middle_center">
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="id_toolbar_align_middle_left">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/main.qml b/main.qml
index e2e8aea..75c192c 100644
--- a/main.qml
+++ b/main.qml
@@ -26,7 +26,7 @@ ApplicationWindow
 
 	id: window
 	visible: false
-	title: qsTrId("Symbol editor")
+	title: qsTrId("id_application_title")
 
 	menuBar: MenuBar
 	{
@@ -80,28 +80,28 @@ ApplicationWindow
 		Menu
 		{
 			title: qsTrId("id_menu_tool")
-			MenuTool { text: qsTrId("Select"); tool: Editor.Tool.Select }
+			MenuTool { text: qsTrId("id_menu_tool_select"); tool: Editor.Tool.Select }
 			MenuSeparator { }
-			MenuTool { text: qsTrId("Line"); tool: Editor.Tool.Line }
+			MenuTool { text: qsTrId("id_menu_tool_line"); tool: Editor.Tool.Line }
 			MenuSeparator { }
-			MenuTool { text: qsTrId("Rectangle Corner"); tool: Editor.Tool.RectCorner }
-			MenuTool { text: qsTrId("Rectangle Center"); tool: Editor.Tool.RectCenter }
+			MenuTool { text: qsTrId("id_menu_tool_rect_corner"); tool: Editor.Tool.RectCorner }
+			MenuTool { text: qsTrId("id_menu_tool_rect_center"); tool: Editor.Tool.RectCenter }
 			MenuSeparator { }
-			MenuTool { text: qsTrId("Circle Corner"); tool: Editor.Tool.CircleCorner }
-			MenuTool { text: qsTrId("Circle Radius"); tool: Editor.Tool.CircleRadius }
-			MenuTool { text: qsTrId("Circle Center"); tool: Editor.Tool.CircleCenter }
+			MenuTool { text: qsTrId("id_menu_tool_circle_corner"); tool: Editor.Tool.CircleCorner }
+			MenuTool { text: qsTrId("id_menu_tool_circle_radius"); tool: Editor.Tool.CircleRadius }
+			MenuTool { text: qsTrId("id_menu_tool_circle_center"); tool: Editor.Tool.CircleCenter }
 			MenuSeparator { }
-			MenuTool { text: qsTrId("Semicircle"); tool: Editor.Tool.ArcSemi }
-			MenuTool { text: qsTrId("Quarter circle"); tool: Editor.Tool.ArcQuarter }
+			MenuTool { text: qsTrId("id_menu_tool_arc_semi"); tool: Editor.Tool.ArcSemi }
+			MenuTool { text: qsTrId("id_menu_tool_arc_quarter"); tool: Editor.Tool.ArcQuarter }
 			MenuSeparator { }
-			MenuTool { text: qsTrId("Text"); tool: Editor.Tool.Text }
+			MenuTool { text: qsTrId("id_menu_tool_text"); tool: Editor.Tool.Text }
 		}
 		Menu
 		{
-			title: qsTrId("Help")
-			MenuItem { text: qsTrId("Help"); shortcut: "F1"; onTriggered: help() }
+			title: qsTrId("id_menu_help")
+			MenuItem { text: qsTrId("id_menu_help_help"); shortcut: "F1"; onTriggered: help() }
 			MenuSeparator { }
-			MenuItem { text: qsTrId("About"); onTriggered: aboutDialog.open() }
+			MenuItem { text: qsTrId("id_menu_about"); onTriggered: aboutDialog.open() }
 		}
 	}
 
@@ -113,42 +113,42 @@ ApplicationWindow
 			{
 				height: 30
 				z: 10
-//				BarTool { image: "image/open_icon&48.png"; tooltip: qsTrId("Open File"); onClicked: open() }
-//				BarTool { image: "image/save_icon&48.png"; tooltip: qsTrId("Save File"); onClicked: save() }
+//				BarTool { image: "image/open_icon&48.png"; tooltip: qsTrId("id_tooltip_file_open"); onClicked: open() }
+//				BarTool { image: "image/save_icon&48.png"; tooltip: qsTrId("id_tooltip_file_save"); onClicked: save() }
 //				BarSeparator { }
-				BarTool { image: "image/undo_icon&48.png"; tooltip: qsTrId("Undo Edit"); onClicked: undo(true) }
-				BarTool { image: "image/redo_icon&48.png"; tooltip: qsTrId("Redo Edit"); onClicked: undo(false) }
-				BarTool { image: "image/cut_icon&48.png"; tooltip: qsTrId("Cut Symbol"); onClicked: cutsymbol() }
-				BarTool { image: "image/copy_icon&48.png"; tooltip: qsTrId("Copy Symbol"); onClicked: copysymbol() }
-				BarTool { image: "image/paste_icon&48.png"; tooltip: qsTrId("Paste symbol"); onClicked: pastesymbol() }
+				BarTool { image: "image/undo_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_undo"); onClicked: undo(true) }
+				BarTool { image: "image/redo_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_redo"); onClicked: undo(false) }
+				BarTool { image: "image/cut_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_cut"); onClicked: cutsymbol() }
+				BarTool { image: "image/copy_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_copyl"); onClicked: copysymbol() }
+				BarTool { image: "image/paste_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_paste"); onClicked: pastesymbol() }
 				BarSeparator { }
-				BarTool { image: "image/rotate_right.png"; tooltip: qsTrId("Rotate right"); onClicked: rotatesymbol(1) }
-				BarTool { image: "image/rotate_left.png"; tooltip: qsTrId("Rotate left"); onClicked: rotatesymbol(-1) }
-				BarTool { image: "image/up_icon&48.png"; tooltip: qsTrId("Raise item"); onClicked: raiseitem(1) }
-				BarTool { image: "image/down_icon&48.png"; tooltip: qsTrId("Lower item"); onClicked: raiseitem(-1) }
-				BarTool { image: "image/delete.png"; tooltip: qsTrId("Delete item"); onClicked: removeitem() }
+				BarTool { image: "image/rotate_right.png"; tooltip: qsTrId("id_tooltip_edit_rotate_right"); onClicked: rotatesymbol(1) }
+				BarTool { image: "image/rotate_left.png"; tooltip: qsTrId("id_tooltip_edit_rotate_left"); onClicked: rotatesymbol(-1) }
+				BarTool { image: "image/up_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_raise_item"); onClicked: raiseitem(1) }
+				BarTool { image: "image/down_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_lower_item"); onClicked: raiseitem(-1) }
+				BarTool { image: "image/delete.png"; tooltip: qsTrId("id_tooltip_delete_raise_item"); onClicked: removeitem() }
 				BarSeparator { }
-//				BarTool { image: "image/plus_icon&48.png"; tooltip: qsTrId("Zoom in"); onClicked: zoom(1) }
-//				BarTool { image: "image/minus_icon&48.png"; tooltip: qsTrId("Zoom out"); onClicked: zoom(-1) }
-				BarTool { image: "image/eye_icon&48.png"; tooltip: qsTrId("Preview"); onClicked: previewsymbol() }
+//				BarTool { image: "image/plus_icon&48.png"; tooltip: qsTrId("id_tooltip_zoom_in"); onClicked: zoom(1) }
+//				BarTool { image: "image/minus_icon&48.png"; tooltip: qsTrId("id_tooltip_zoom_out"); onClicked: zoom(-1) }
+				BarTool { image: "image/eye_icon&48.png"; tooltip: qsTrId("id_tooltip_zoom_preview"); onClicked: previewsymbol() }
 				BarSeparator { }
-				BarTool { image: "image/cursor_icon&48.png"; tooltip: qsTrId("Select item"); tool: Editor.Tool.Select }
+				BarTool { image: "image/cursor_icon&48.png"; tooltip: qsTrId("id_tooltip_tool_select"); tool: Editor.Tool.Select }
 				BarSeparator { }
-				BarTool { image: "image/polyline.png"; tooltip: qsTrId("Straight Line"); tool: Editor.Tool.Line }
+				BarTool { image: "image/polyline.png"; tooltip: qsTrId("id_tooltip_tool_line"); tool: Editor.Tool.Line }
 				BarSeparator { }
-				BarTool { image: "image/rectangle_corner.png"; tooltip: qsTrId("Rectangle Corners"); tool: Editor.Tool.RectCorner }
-				BarTool { image: "image/rectangle_center.png"; tooltip: qsTrId("Rectangle Center"); tool: Editor.Tool.RectCenter }
+				BarTool { image: "image/rectangle_corner.png"; tooltip: qsTrId("id_tooltip_tool_rect_corner"); tool: Editor.Tool.RectCorner }
+				BarTool { image: "image/rectangle_center.png"; tooltip: qsTrId("id_tooltip_tool_rect_center"); tool: Editor.Tool.RectCenter }
 				BarSeparator { }
-				BarTool { image: "image/circle_corner.png"; tooltip: qsTrId("Circle Corner"); tool: Editor.Tool.CircleCorner }
-				BarTool { image: "image/circle_radius.png"; tooltip: qsTrId("Circle Radius"); tool: Editor.Tool.CircleRadius }
-				BarTool { image: "image/circle_center.png"; tooltip: qsTrId("Circle Center"); tool: Editor.Tool.CircleCenter }
+				BarTool { image: "image/circle_corner.png"; tooltip: qsTrId("id_tooltip_tool_circle_corner"); tool: Editor.Tool.CircleCorner }
+				BarTool { image: "image/circle_radius.png"; tooltip: qsTrId("id_tooltip_tool_circle_radius"); tool: Editor.Tool.CircleRadius }
+				BarTool { image: "image/circle_center.png"; tooltip: qsTrId("id_tooltip_tool_circle_center"); tool: Editor.Tool.CircleCenter }
 				BarSeparator { }
-				BarTool { image: "image/text.png"; tooltip: qsTrId("Text String"); tool: Editor.Tool.Text }
+				BarTool { image: "image/text.png"; tooltip: qsTrId("id_tooltip_tool_text"); tool: Editor.Tool.Text }
 			}
 			RowLayout
 			{
 				height: 32
-				Label { text: qsTrId("Snap") }
+				Label { text: qsTrId("id_toolbar_snap_grid") }
 				ComboBox
 				{
 					id: snaplist
@@ -169,17 +169,22 @@ ApplicationWindow
 				}
 				BarSeparator { }
 				Item { Layout.fillWidth: true }
-				Label { text: qsTrId("Fill") }
+				Label { text: qsTrId("id_toolbar_fill_item") }
 				ComboBox
 				{
 					id: filllist
 					implicitWidth: 50
-					model: [ qsTrId("0    No fill"), qsTrId("1    Backgroud"), qsTrId("2    Area fill") ]
+					model:
+					[
+						qsTrId("id_toolbar_fill_none"),
+						qsTrId("id_toolbar_fill_back"),
+						qsTrId("id_toolbar_fill_area")
+					]
 					onCurrentIndexChanged: { fillitem = currentIndex; editor.update() }
 					function setFill() { currentIndex = fillitem }
 				}
 				BarSeparator { }
-				Label { text: qsTrId("Line width") }
+				Label { text: qsTrId("id_toolbar_line_width") }
 				ComboBox
 				{
 					id: widthlist
@@ -189,7 +194,7 @@ ApplicationWindow
 					function setWidth() { currentIndex = linewidth - 1 }
 				}
 				BarSeparator { }
-				Label { text: qsTrId("Text size") }
+				Label { text: qsTrId("id_toolbar_text_size") }
 				ComboBox
 				{
 					id: sizelist
@@ -199,31 +204,31 @@ ApplicationWindow
 					function setSize() { currentIndex = textsize - 1 }
 				}
 				BarSeparator { }
-				Label { text: qsTrId("Alignment") }
+				Label { text: qsTrId("id_toolbar_alignment") }
 				ComboBox
 				{
 					id: alignlist
 					implicitWidth: 50
 					model:
 					[
-						qsTrId("1     Top Right"),
-						qsTrId("2     Top Center"),
-						qsTrId("3     Top Left"),
-						qsTrId("4     Base Right"),
-						qsTrId("5     Base Center"),
-						qsTrId("6     Base Left"),
-						qsTrId("7     Bottom Right"),
-						qsTrId("8     Bottom Center"),
-						qsTrId("9     Bottom Left"),
-						qsTrId("10    Middle Right"),
-						qsTrId("11    Middle Center"),
-						qsTrId("12    Middle Left")
+						qsTrId("id_toolbar_align_top_right"),
+						qsTrId("id_toolbar_align_top_center"),
+						qsTrId("id_toolbar_align_top_left"),
+						qsTrId("id_toolbar_align_base_right"),
+						qsTrId("id_toolbar_align_base_center"),
+						qsTrId("id_toolbar_align_base_left"),
+						qsTrId("id_toolbar_align_bottom_right"),
+						qsTrId("id_toolbar_align_bottom_center"),
+						qsTrId("id_toolbar_align_bottom_left"),
+						qsTrId("id_toolbar_align_middle_right"),
+						qsTrId("id_toolbar_align_middle_center"),
+						qsTrId("id_toolbar_align_middle_left")
 					]
 					onCurrentIndexChanged: { alignment = currentIndex + 1 }
 					function setAlign() { currentIndex = alignment - 1 }
 				}
 				BarSeparator { }
-				Label { text: qsTrId("id-toolbar-text") }
+				Label { text: qsTrId("id_toolbar_text_field") }
 				TextField
 				{
 					id: textfield
@@ -250,11 +255,11 @@ ApplicationWindow
 	Dialog
 	{
 		id: aboutDialog
-		title: qsTrId("About")
+		title: qsTrId("id_dialog_about")
 		Label
 		{
 			anchors.fill: parent
-			text: qsTrId("id-help-about-text")
+			text: qsTrId("id_dialog_about_text")
 			horizontalAlignment: Text.AlignHCenter
 		}
 
diff --git a/symedit.pro b/symedit.pro
index 3514ea3..3f9a384 100644
--- a/symedit.pro
+++ b/symedit.pro
@@ -18,8 +18,7 @@ SOURCES += main.cpp \
 
 RESOURCES += \
     qml.qrc \
-    translations.qrc \
-    translations.qrc
+    locale.qrc
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =