From 9b03671ec2dd7ddb962f69477b3b20686eb81201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikko=20Syrj=C3=A4?= Date: Sat, 2 Mar 2019 01:03:02 +0200 Subject: Initial english translation. --- locale.qrc | 6 ++ locale/symedit.en_GB.ts | 198 +++++++++++++++++++++++++++--------------------- locale/symedit.fi_FI.ts | 126 +++++++++++++++++------------- locale/symedit.ts | 168 ++++++++++++++++++++++------------------ main.qml | 121 +++++++++++++++-------------- symedit.pro | 3 +- translations.qrc | 6 -- 7 files changed, 352 insertions(+), 276 deletions(-) create mode 100644 locale.qrc delete mode 100644 translations.qrc diff --git a/locale.qrc b/locale.qrc new file mode 100644 index 0000000..cdbabdf --- /dev/null +++ b/locale.qrc @@ -0,0 +1,6 @@ + + + locale/symedit.fi_FI.qm + locale/symedit.en_GB.qm + + 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 @@ - + - + Symbol Editor - + File - + Open... - + Save... - + Exit - + Edit - + Undo - + Redo - + Cut - + Copy - + Paste - + Rotate Right - + Rotate Left - + Raise Item - + Lower Item - + Delete Item - + View - + Zoom In - + Zoom Out - + Zoom Out - + Show Grid - + Preview - + Tool - + - + Select - + - + Line - + - + Rectangle Corner - + - + Rectangle Center - + - + Circle Corner - + - + Circle Radius - + - + Circle Center - + - + Semicircle - + - + Quarter Circle - + - + Text - + - + Help - + - + Help - + - + About - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + Snap Grid - + + + Fill Item + + - + - + - + + + Line Width + + + + Text Size + + + + Alignment + + - + - + - + - + - + - + - + - + - + - + - + - + + + Text + + + + About Symbol Editor + + 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 @@ - + - + Symbolieditori @@ -95,199 +95,223 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + 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 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + 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 = diff --git a/translations.qrc b/translations.qrc deleted file mode 100644 index cdbabdf..0000000 --- a/translations.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - locale/symedit.fi_FI.qm - locale/symedit.en_GB.qm - - -- cgit v1.2.3