From 07966001ff12165282622b6c40fdd8a5f27421bc Mon Sep 17 00:00:00 2001 From: twanvl Date: Wed, 18 Jun 2008 14:37:04 +0000 Subject: [PATCH] Translate image slice window with locale git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@982 0fc631ac-6414-0410-93d0-97cfa31319b6 --- data/en.mse-locale/locale | 22 ++++++++++++++++ src/gui/image_slice_window.cpp | 32 ++++++++++++------------ src/resource/common/expected_locale_keys | 20 ++++++++++++++- 3 files changed, 57 insertions(+), 17 deletions(-) diff --git a/data/en.mse-locale/locale b/data/en.mse-locale/locale index 8188a1c5..d8114e17 100644 --- a/data/en.mse-locale/locale +++ b/data/en.mse-locale/locale @@ -411,6 +411,10 @@ label: # Style tab styling options: Styling options + # Random pack panel + pack selection: Pack selection + pack totals: Totals + # Open dialogs all files All files @@ -468,9 +472,23 @@ label: original: Original: result: Result: size: Size + original size: &Original Size + size to fit: Size to &Fit + force to fit: F&orce to Fit + custom size: &Custom Size selection: Selection + selection left: &Left + selection top: &Top + selection width: &Width + selection height: &Height zoom: Zoom + fix aspect ratio: Fix aspect ratio (width/height) + zoom amount: Zoom + zoom amount x: Zoom &X + zoom amount y: Zoom &Y + zoom %: % filter: Filter + sharpen filter: &Sharpen filter # Auto replace auto match: Match @@ -507,6 +525,9 @@ button: insert parameter: Insert Parameter... refer parameter: Use Parameter... + # Random pack panel + generate pack: &Generate Pack + # Welcome new set: New set open set: Open set @@ -772,6 +793,7 @@ type: set: set stylesheet: stylesheet export template:export template + symbol: symbol card: card cards: cards field: field diff --git a/src/gui/image_slice_window.cpp b/src/gui/image_slice_window.cpp index 81fb3f67..c4cd6db3 100644 --- a/src/gui/image_slice_window.cpp +++ b/src/gui/image_slice_window.cpp @@ -85,10 +85,10 @@ ImageSliceWindow::ImageSliceWindow(Window* parent, const Image& source, const wx selector = new ImageSliceSelector(this, ID_SELECTOR, slice); preview = new ImageSlicePreview (this, ID_PREVIEW, slice, mask); - String sizes[] = { _("&Original Size") - , _("Size to &Fit") - , _("F&orce to Fit") - , _("&Custom Size") }; + String sizes[] = { _LABEL_("original size") + , _LABEL_("size to fit") + , _LABEL_("force to fit") + , _LABEL_("custom size") }; size = new wxRadioBox(this, ID_SIZE, _LABEL_("size"), defPos, wxDefaultSize, 4, sizes, 1); left = new wxSpinCtrl(this, ID_LEFT, _(""), defPos, spinSize); @@ -100,7 +100,7 @@ ImageSliceWindow::ImageSliceWindow(Window* parent, const Image& source, const wx width ->SetRange(0,5000); height->SetRange(0,5000); - fix_aspect = new wxCheckBox(this, ID_FIX_ASPECT, _("Fix aspect ratio (width/height)")); + fix_aspect = new wxCheckBox(this, ID_FIX_ASPECT, _LABEL_("fix aspect ratio")); zoom_x = new wxSpinCtrl(this, ID_ZOOM_X, _(""), defPos, spinSize); zoom_y = new wxSpinCtrl(this, ID_ZOOM_Y, _(""), defPos, spinSize); zoom = new wxSpinCtrl(this, ID_ZOOM, _(""), defPos, spinSize); @@ -108,7 +108,7 @@ ImageSliceWindow::ImageSliceWindow(Window* parent, const Image& source, const wx zoom_y->SetRange(1,10000); zoom ->SetRange(1,10000); - sharpen = new wxCheckBox(this, ID_SHARPEN, _("&Sharpen Filter")); + sharpen = new wxCheckBox(this, ID_SHARPEN, _LABEL_("sharpen filter")); sharpen_amount = new wxSlider(this, ID_SHARPEN_AMOUNT, 0, 0, 100); // allowOutside= new CheckBox(&this, idSliceAllowOutside, _("Allow selection outside source")) // bgColor = new ColorSelector(&this, wxID_ANY) @@ -133,13 +133,13 @@ ImageSliceWindow::ImageSliceWindow(Window* parent, const Image& source, const wx s5->AddStretchSpacer(1); wxSizer* s6 = new wxStaticBoxSizer(wxVERTICAL, this, _LABEL_("selection")); wxSizer* s7 = new wxFlexGridSizer(0, 2, 4, 5); - s7->Add(new wxStaticText(this, wxID_ANY, _("&Left")), 0, wxALIGN_CENTER_VERTICAL); + s7->Add(new wxStaticText(this, wxID_ANY, _LABEL_("selection left")), 0, wxALIGN_CENTER_VERTICAL); s7->Add(left, 0, wxEXPAND); - s7->Add(new wxStaticText(this, wxID_ANY, _("&Top")), 0, wxALIGN_CENTER_VERTICAL); + s7->Add(new wxStaticText(this, wxID_ANY, _LABEL_("selection top")), 0, wxALIGN_CENTER_VERTICAL); s7->Add(top, 0, wxEXPAND); - s7->Add(new wxStaticText(this, wxID_ANY, _("&Width")), 0, wxALIGN_CENTER_VERTICAL); + s7->Add(new wxStaticText(this, wxID_ANY, _LABEL_("selection width")), 0, wxALIGN_CENTER_VERTICAL); s7->Add(width, 0, wxEXPAND); - s7->Add(new wxStaticText(this, wxID_ANY, _("&Height")), 0, wxALIGN_CENTER_VERTICAL); + s7->Add(new wxStaticText(this, wxID_ANY, _LABEL_("selection height")), 0, wxALIGN_CENTER_VERTICAL); s7->Add(height, 0, wxEXPAND); s6->Add(s7, 1, wxEXPAND | wxALL, 4); s5->Add(s6, 0, wxEXPAND | wxALL, 4); @@ -147,17 +147,17 @@ ImageSliceWindow::ImageSliceWindow(Window* parent, const Image& source, const wx wxSizer* s8 = zoom_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _LABEL_("zoom")); s8->Add(fix_aspect, 0, wxEXPAND | wxALL & ~wxBOTTOM, 4); wxSizer* s9 = zoom_fixed = new wxFlexGridSizer(0, 3, 4, 5); - s9->Add(new wxStaticText(this, wxID_ANY, _("&Zoom")), 0, wxALIGN_CENTER_VERTICAL); + s9->Add(new wxStaticText(this, wxID_ANY, _LABEL_("zoom amount")), 0, wxALIGN_CENTER_VERTICAL); s9->Add(zoom, 0, wxEXPAND); - s9->Add(new wxStaticText(this, wxID_ANY, _("%")), 0, wxALIGN_CENTER_VERTICAL); + s9->Add(new wxStaticText(this, wxID_ANY, _LABEL_("zoom %")), 0, wxALIGN_CENTER_VERTICAL); s8->Add(s9, 0, wxEXPAND | wxALL, 4); wxSizer* sA = zoom_free = new wxFlexGridSizer(0, 3, 4, 5); - sA->Add(new wxStaticText(this, wxID_ANY, _("Zoom &X")), 0, wxALIGN_CENTER_VERTICAL); + sA->Add(new wxStaticText(this, wxID_ANY, _LABEL_("zoom amount x")), 0, wxALIGN_CENTER_VERTICAL); sA->Add(zoom_x, 0, wxEXPAND); - sA->Add(new wxStaticText(this, wxID_ANY, _("%")), 0, wxALIGN_CENTER_VERTICAL); - sA->Add(new wxStaticText(this, wxID_ANY, _("Zoom &Y")), 0, wxALIGN_CENTER_VERTICAL); + sA->Add(new wxStaticText(this, wxID_ANY, _LABEL_("zoom %")), 0, wxALIGN_CENTER_VERTICAL); + sA->Add(new wxStaticText(this, wxID_ANY, _LABEL_("zoom amount y")), 0, wxALIGN_CENTER_VERTICAL); sA->Add(zoom_y, 0, wxEXPAND); - sA->Add(new wxStaticText(this, wxID_ANY, _("%")), 0, wxALIGN_CENTER_VERTICAL); + sA->Add(new wxStaticText(this, wxID_ANY, _LABEL_("zoom %")), 0, wxALIGN_CENTER_VERTICAL); s8->Add(sA, 0, wxEXPAND | wxALL, 4); s5->Add(s8, 0, wxEXPAND | wxALL, 4); s5->AddStretchSpacer(1); diff --git a/src/resource/common/expected_locale_keys b/src/resource/common/expected_locale_keys index 37eb3c36..2580af37 100644 --- a/src/resource/common/expected_locale_keys +++ b/src/resource/common/expected_locale_keys @@ -1,6 +1,6 @@ # This file contains the keys expected to be in MSE locales # It was automatically generated by tools/locale/locale.pl -# Generated on Thu Jun 5 00:45:34 2008 +# Generated on Wed Jun 18 16:31:33 2008 action: add control point: 0 @@ -49,6 +49,7 @@ button: don't install package: 0 edit symbol: 0 enabled: 0 + generate pack: 0 hide: 0 high quality: 0 if internet connection exists: 0 @@ -264,12 +265,15 @@ label: check at startup: 0 checking requires internet: 0 columns: 0 + custom size: 0 export filenames: 0 external programs: 0 filename conflicts: 0 filename format: 0 filename is ignored: 0 filter: 0 + fix aspect ratio: 0 + force to fit: 0 game type: 0 html export options: 0 html template: 0 @@ -280,6 +284,9 @@ label: match: 0 mode: 0 original: 0 + original size: 0 + pack selection: 0 + pack totals: 0 package action: 0 package conflicts: 0 package installable: 0 @@ -297,9 +304,15 @@ label: select cards print: 0 select columns: 0 selection: 0 + selection height: 0 + selection left: 0 + selection top: 0 + selection width: 0 set code: 0 + sharpen filter: 0 sides: optional, 0 size: 0 + size to fit: 0 standard keyword: 1 style type: 0 stylesheet not found: 1 @@ -307,6 +320,10 @@ label: upgrade package: 0 uses: 0 zoom: 0 + zoom %: 0 + zoom amount: 0 + zoom amount x: 0 + zoom amount y: 0 menu: about: 0 add card: 0 @@ -560,5 +577,6 @@ type: string: 0 style: 0 stylesheet: 0 + symbol: 0 triangle: 0 value: 0