Menu
▾
▴
[Hugin-cvs] /hgroot/hugin/hugin: Fixes some issues with strings, which shoul...
|
From: <hug...@li...> - 2012-11-15 17:59:42
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/c322ae81e6ea changeset: 6034:c322ae81e6ea user: tmodes date: Thu Nov 15 18:58:16 2012 +0100 description: Fixes some issues with strings, which should not be translated diffstat: src/hugin1/hugin/ImagesTree.cpp | 96 +- src/translations/bg.po | 2076 ++++++++++++------------- src/translations/ca_ES.po | 2117 +++++++++++++------------- src/translations/cs_CZ.po | 2000 ++++++++++++------------ src/translations/da.po | 1943 +++++++++++------------ src/translations/de.po | 2086 +++++++++++++------------- src/translations/en_GB.po | 2611 +++++++++++++++----------------- src/translations/es.po | 1945 ++++++++++++------------ src/translations/eu.po | 1971 ++++++++++++------------ src/translations/fi.po | 2008 ++++++++++++------------- src/translations/fr.po | 1977 ++++++++++++------------ src/translations/hu.po | 2012 ++++++++++++------------ src/translations/hugin.pot | 2675 ++++++++++++++++----------------- src/translations/ignored-strings.txt | 3 + src/translations/it.po | 1979 ++++++++++++------------ src/translations/ja.po | 1918 +++++++++++------------ src/translations/ko.po | 2084 ++++++++++++------------- src/translations/nl.po | 2006 ++++++++++++------------ src/translations/pl.po | 1972 ++++++++++++------------- src/translations/pt_BR.po | 1941 +++++++++++------------ src/translations/ro.po | 2090 +++++++++++++------------- src/translations/ru.po | 2001 ++++++++++++------------ src/translations/sk.po | 1993 ++++++++++++------------ src/translations/sl.po | 2090 +++++++++++++------------- src/translations/sv.po | 1975 ++++++++++++------------ src/translations/uk.po | 2103 +++++++++++++------------- src/translations/zh_CN.po | 1971 ++++++++++++------------ src/translations/zh_TW.po | 1969 ++++++++++++------------ 28 files changed, 26218 insertions(+), 27394 deletions(-) diffs (truncated from 120882 to 500 lines): diff -r 3bb0964389df -r c322ae81e6ea src/hugin1/hugin/ImagesTree.cpp --- a/src/hugin1/hugin/ImagesTree.cpp Wed Nov 14 20:53:26 2012 +0100 +++ b/src/hugin1/hugin/ImagesTree.cpp Thu Nov 15 18:58:16 2012 +0100 @@ -137,55 +137,55 @@ };\ m_variableVector.push_back(IVE);\ counter++; - ADDCOLUMN(wxT("#"), "imgNr", 35, wxALIGN_LEFT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("Filename"), "filename", 200, wxALIGN_LEFT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("width"), "width", 60, wxALIGN_RIGHT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("height"), "height", 60, wxALIGN_RIGHT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("Anchor"), "anchor", 60, wxALIGN_RIGHT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("# Ctrl Pnts"), "cps", 60, wxALIGN_RIGHT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("Lens no."), "lensNr", 60, wxALIGN_RIGHT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("Stack Number"), "stackNr", 60, wxALIGN_RIGHT,false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(wxT("#"), "imgNr", 35, wxALIGN_LEFT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("Filename"), "filename", 200, wxALIGN_LEFT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("Width"), "width", 60, wxALIGN_RIGHT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("Height"), "height", 60, wxALIGN_RIGHT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("Anchor"), "anchor", 60, wxALIGN_RIGHT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("# Ctrl Pnts"), "cps", 60, wxALIGN_RIGHT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("Lens no."), "lensNr", 60, wxALIGN_RIGHT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("Stack no."), "stackNr", 60, wxALIGN_RIGHT, false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("Camera maker"), "maker", 100, wxALIGN_LEFT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("Camera model"), "model", 100, wxALIGN_LEFT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("Lens"), "lens", 100, wxALIGN_LEFT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("Capture date"), "date", 100, wxALIGN_LEFT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("Focal length"), "focallength", 80, wxALIGN_LEFT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("Aperture"), "aperture", 50, wxALIGN_LEFT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("Shutter Speed"), "time", 50, wxALIGN_LEFT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("ISO"), "iso", 50, wxALIGN_LEFT,false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("Maker"), "maker", 100, wxALIGN_LEFT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("Model"), "model", 100, wxALIGN_LEFT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("Lens"), "lens", 100, wxALIGN_LEFT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("Capture date"), "date", 100, wxALIGN_LEFT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("Focal length"), "focallength", 80, wxALIGN_LEFT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("Aperture"), "aperture", 50, wxALIGN_LEFT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("Shutter Speed"), "time", 50, wxALIGN_LEFT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("ISO"), "iso", 50, wxALIGN_LEFT, false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("yaw (y)"), "y", 60, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_Yaw) - ADDCOLUMN(_("pitch (p)"), "p", 60, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_Yaw) - ADDCOLUMN(_("roll (r)"), "r", 60, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_Yaw) - ADDCOLUMN(_("X (TrX)"), "TrX", 60, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_Yaw) - ADDCOLUMN(_("Y (TrY)"), "TrY", 60, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_Yaw) - ADDCOLUMN(_("Z (TrZ)"), "TrZ", 60, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_Yaw) + ADDCOLUMN(_("Yaw (y)"), "y", 60, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_Yaw) + ADDCOLUMN(_("Pitch (p)"), "p", 60, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_Yaw) + ADDCOLUMN(_("Roll (r)"), "r", 60, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_Yaw) + ADDCOLUMN(wxT("X (TrX)"), "TrX", 60, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_Yaw) + ADDCOLUMN(wxT("Y (TrY)"), "TrY", 60, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_Yaw) + ADDCOLUMN(wxT("Z (TrZ)"), "TrZ", 60, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_Yaw) - ADDCOLUMN(_("Lens type (f)"), "projection", 100, wxALIGN_LEFT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("hfov (v)"), "v", 80, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_HFOV) - ADDCOLUMN(_("a"), "a", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_RadialDistortion) - ADDCOLUMN(_("b"), "b", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_RadialDistortion) - ADDCOLUMN(_("c"), "c", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_RadialDistortion) - ADDCOLUMN(_("d"), "d", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_RadialDistortionCenterShift) - ADDCOLUMN(_("e"), "e", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_RadialDistortionCenterShift) - ADDCOLUMN(_("g"), "g", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_Shear) - ADDCOLUMN(_("t"), "t", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_Shear) + ADDCOLUMN(_("Lens type (f)"), "projection", 100, wxALIGN_LEFT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(_("Hfov (v)"), "v", 80, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_HFOV) + ADDCOLUMN(wxT("a"), "a", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_RadialDistortion) + ADDCOLUMN(wxT("b"), "b", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_RadialDistortion) + ADDCOLUMN(wxT("c"), "c", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_RadialDistortion) + ADDCOLUMN(wxT("d"), "d", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_RadialDistortionCenterShift) + ADDCOLUMN(wxT("e"), "e", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_RadialDistortionCenterShift) + ADDCOLUMN(wxT("g"), "g", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_Shear) + ADDCOLUMN(wxT("t"), "t", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_Shear) - ADDCOLUMN(_("EV"), "Eev", 50, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_ExposureValue) - ADDCOLUMN(_("Er"), "Er", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_WhiteBalanceRed) - ADDCOLUMN(_("Eb"), "Eb", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_WhiteBalanceBlue) - ADDCOLUMN(_("Vb"), "Vb", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_RadialVigCorrCoeff) - ADDCOLUMN(_("Vc"), "Vc", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_RadialVigCorrCoeff) - ADDCOLUMN(_("Vd"), "Vd", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_RadialVigCorrCoeff) - ADDCOLUMN(_("Vx"), "Vx", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_RadialVigCorrCenterShift) - ADDCOLUMN(_("Vy"), "Vy", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_RadialVigCorrCenterShift) - ADDCOLUMN(_("Response type"), "response", 80, wxALIGN_RIGHT,false, HuginBase::ImageVariableGroup::IVE_Filename) - ADDCOLUMN(_("Ra"), "Ra", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_EMoRParams) - ADDCOLUMN(_("Rb"), "Rb", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_EMoRParams) - ADDCOLUMN(_("Rc"), "Rc", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_EMoRParams) - ADDCOLUMN(_("Rd"), "Rd", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_EMoRParams) - ADDCOLUMN(_("Re"), "Re", 40, wxALIGN_RIGHT,true, HuginBase::ImageVariableGroup::IVE_EMoRParams) + ADDCOLUMN(wxT("EV"), "Eev", 50, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_ExposureValue) + ADDCOLUMN(wxT("Er"), "Er", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_WhiteBalanceRed) + ADDCOLUMN(wxT("Eb"), "Eb", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_WhiteBalanceBlue) + ADDCOLUMN(wxT("Vb"), "Vb", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_RadialVigCorrCoeff) + ADDCOLUMN(wxT("Vc"), "Vc", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_RadialVigCorrCoeff) + ADDCOLUMN(wxT("Vd"), "Vd", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_RadialVigCorrCoeff) + ADDCOLUMN(wxT("Vx"), "Vx", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_RadialVigCorrCenterShift) + ADDCOLUMN(wxT("Vy"), "Vy", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_RadialVigCorrCenterShift) + ADDCOLUMN(_("Response type"), "response", 80, wxALIGN_RIGHT, false, HuginBase::ImageVariableGroup::IVE_Filename) + ADDCOLUMN(wxT("Ra"), "Ra", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_EMoRParams) + ADDCOLUMN(wxT("Rb"), "Rb", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_EMoRParams) + ADDCOLUMN(wxT("Rc"), "Rc", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_EMoRParams) + ADDCOLUMN(wxT("Rd"), "Rd", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_EMoRParams) + ADDCOLUMN(wxT("Re"), "Re", 40, wxALIGN_RIGHT, true, HuginBase::ImageVariableGroup::IVE_EMoRParams) //empty column to have enough space on the right side AddColumn(wxEmptyString,10); @@ -405,10 +405,12 @@ SetItemText(item, m_columnMap["height"], wxString::Format(wxT("%d"), img.getSize().height())); wxChar flags[] = wxT("--"); - if (m_pano->getOptions().optimizeReferenceImage == imgNr) { + if (m_pano->getOptions().optimizeReferenceImage == imgNr) + { flags[0]='A'; } - if (m_pano->getOptions().colorReferenceImage == imgNr) { + if (m_pano->getOptions().colorReferenceImage == imgNr) + { flags[1]='C'; } SetItemText(item, m_columnMap["anchor"], wxString(flags, wxConvLocal)); diff -r 3bb0964389df -r c322ae81e6ea src/translations/bg.po --- a/src/translations/bg.po Wed Nov 14 20:53:26 2012 +0100 +++ b/src/translations/bg.po Thu Nov 15 18:58:16 2012 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: bg\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2012-11-13 21:20+0100\n" +"POT-Creation-Date: 2012-11-15 18:41+0100\n" "PO-Revision-Date: 2008-07-10 10:12+0200\n" "Last-Translator: Svetoslav Stefanov <lfu...@gm...>\n" "Language-Team: Bulgarian <bg...@li...>\n" @@ -40,9 +40,9 @@ #: hugin1/hugin/CPEditorPanel.cpp:1783 hugin1/hugin/GLPreviewFrame.cpp:3107 #: hugin1/hugin/GLPreviewFrame.cpp:3179 hugin1/hugin/GLViewer.cpp:287 #: hugin1/hugin/GLViewer.cpp:297 hugin1/hugin/MainFrame.cpp:192 -#: hugin1/hugin/MainFrame.cpp:861 hugin1/hugin/MainFrame.cpp:1109 -#: hugin1/hugin/MainFrame.cpp:1486 hugin1/hugin/MainFrame.cpp:1534 -#: hugin1/hugin/MainFrame.cpp:2024 +#: hugin1/hugin/MainFrame.cpp:835 hugin1/hugin/MainFrame.cpp:1083 +#: hugin1/hugin/MainFrame.cpp:1460 hugin1/hugin/MainFrame.cpp:1508 +#: hugin1/hugin/MainFrame.cpp:1998 #: hugin1/hugin/OptimizePhotometricPanel.cpp:277 #: hugin1/hugin/OptimizePhotometricPanel.cpp:306 #: hugin1/hugin/PanoOperation.cpp:150 hugin1/hugin/PanoOperation.cpp:527 @@ -57,7 +57,7 @@ #: hugin1/base_wx/huginConfig.cpp:57 hugin1/base_wx/huginConfig.cpp:69 #: hugin1/base_wx/platform.cpp:131 hugin1/base_wx/RunStitchPanel.cpp:111 -#: hugin1/hugin/MainFrame.cpp:1534 hugin1/hugin/PanoPanel.cpp:1212 +#: hugin1/hugin/MainFrame.cpp:1508 hugin1/hugin/PanoPanel.cpp:1212 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "ÐÑнÑнаÑа пÑогÑама %s не беÑе намеÑена. ÐÑÑÑане кÑм вклÑÑенаÑа в hugin." @@ -94,7 +94,7 @@ #: hugin1/hugin/GLPreviewFrame.cpp:1614 hugin1/hugin/GLPreviewFrame.cpp:1621 #: hugin1/hugin/GLPreviewFrame.cpp:1635 hugin1/hugin/GLPreviewFrame.cpp:1642 #: hugin1/hugin/GLPreviewFrame.cpp:1649 hugin1/hugin/GLPreviewFrame.cpp:3183 -#: hugin1/hugin/MainFrame.cpp:857 hugin1/hugin/MainFrame.cpp:1735 +#: hugin1/hugin/MainFrame.cpp:831 hugin1/hugin/MainFrame.cpp:1709 #: hugin1/hugin/MaskEditorPanel.cpp:532 hugin1/hugin/PreferencesDialog.cpp:977 #: hugin1/ptbatcher/FindPanoDialog.cpp:250 #: hugin1/ptbatcher/FindPanoDialog.cpp:271 @@ -122,20 +122,20 @@ msgid "Equirectangular" msgstr "ÐеогÑаÑÑка пÑоекÑиÑ" -#: hugin1/base_wx/huginConfig.cpp:297 hugin1/hugin/ImagesTree.cpp:149 +#: hugin1/base_wx/huginConfig.cpp:297 #, fuzzy msgid "Camera maker" msgstr "ÐамеÑа и обекÑив" -#: hugin1/base_wx/huginConfig.cpp:298 hugin1/hugin/ImagesTree.cpp:150 +#: hugin1/base_wx/huginConfig.cpp:298 #, fuzzy msgid "Camera model" msgstr "РеакÑÐ¸Ñ Ð½Ð° камеÑаÑа:" #: hugin1/base_wx/huginConfig.cpp:299 hugin1/hugin/ImagesPanel.cpp:633 -#: hugin1/hugin/ImagesTree.cpp:151 hugin1/hugin/ImagesTree.cpp:1159 -#: translations/xrc.cpp:221 translations/xrc.cpp:233 translations/xrc.cpp:296 -#: translations/xrc.cpp:312 xrc.cpp:221 xrc.cpp:233 xrc.cpp:296 xrc.cpp:312 +#: hugin1/hugin/ImagesTree.cpp:151 hugin1/hugin/ImagesTree.cpp:1161 +#: translations/xrc.cpp:220 translations/xrc.cpp:232 translations/xrc.cpp:293 +#: translations/xrc.cpp:309 xrc.cpp:220 xrc.cpp:232 xrc.cpp:293 xrc.cpp:309 msgid "Lens" msgstr "ÐбекÑив" @@ -230,14 +230,14 @@ #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:612 #: hugin1/ptbatcher/RunStitchFrame.cpp:43 -#: hugin1/stitch_project/hugin_stitch_project.cpp:126 translations/xrc.cpp:148 -#: translations/xrc.cpp:211 translations/xrc.cpp:249 translations/xrc.cpp:298 -#: translations/xrc.cpp:314 translations/xrc.cpp:321 translations/xrc.cpp:499 -#: translations/xrc.cpp:532 translations/xrc.cpp:536 translations/xrc.cpp:540 -#: translations/xrc.cpp:634 translations/xrc.cpp:783 translations/xrc.cpp:815 -#: translations/xrc.cpp:1038 xrc.cpp:148 xrc.cpp:211 xrc.cpp:249 xrc.cpp:298 -#: xrc.cpp:314 xrc.cpp:321 xrc.cpp:499 xrc.cpp:532 xrc.cpp:536 xrc.cpp:540 -#: xrc.cpp:634 xrc.cpp:783 xrc.cpp:815 xrc.cpp:1038 +#: hugin1/stitch_project/hugin_stitch_project.cpp:126 translations/xrc.cpp:147 +#: translations/xrc.cpp:210 translations/xrc.cpp:246 translations/xrc.cpp:295 +#: translations/xrc.cpp:311 translations/xrc.cpp:318 translations/xrc.cpp:496 +#: translations/xrc.cpp:529 translations/xrc.cpp:533 translations/xrc.cpp:537 +#: translations/xrc.cpp:631 translations/xrc.cpp:780 translations/xrc.cpp:812 +#: translations/xrc.cpp:1035 xrc.cpp:147 xrc.cpp:210 xrc.cpp:246 xrc.cpp:295 +#: xrc.cpp:311 xrc.cpp:318 xrc.cpp:496 xrc.cpp:529 xrc.cpp:533 xrc.cpp:537 +#: xrc.cpp:631 xrc.cpp:780 xrc.cpp:812 xrc.cpp:1035 msgid "Cancel" msgstr "ÐÑказ" @@ -267,7 +267,7 @@ "jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|ÐÑиÑки Ñайлове (*)|*" #: hugin1/base_wx/PTWXDlg.cpp:49 hugin1/base_wx/PTWXDlg.cpp:68 -#: hugin1/base_wx/PTWXDlg.cpp:122 translations/xrc.cpp:785 xrc.cpp:785 +#: hugin1/base_wx/PTWXDlg.cpp:122 translations/xrc.cpp:782 xrc.cpp:782 msgid "Panorama Tools" msgstr "Panorama Tools" @@ -417,7 +417,7 @@ #: hugin1/calibrate_lens/LensCalApp.cpp:80 #: hugin1/calibrate_lens/LensCalApp.cpp:92 hugin1/hugin/huginApp.cpp:167 #: hugin1/hugin/huginApp.cpp:179 hugin1/hugin/huginApp.cpp:188 -#: hugin1/hugin/huginApp.cpp:202 hugin1/hugin/MainFrame.cpp:2019 +#: hugin1/hugin/huginApp.cpp:202 hugin1/hugin/MainFrame.cpp:1993 #: hugin1/ptbatcher/PTBatcherGUI.cpp:80 hugin1/ptbatcher/PTBatcherGUI.cpp:91 #: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 #: hugin1/stitch_project/hugin_stitch_project.cpp:306 @@ -447,7 +447,7 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:100 #: hugin1/calibrate_lens/LensCalFrame.cpp:470 hugin1/hugin/MainFrame.cpp:191 -#: hugin1/hugin/MainFrame.cpp:1108 hugin1/hugin/PanoOperation.cpp:149 +#: hugin1/hugin/MainFrame.cpp:1082 hugin1/hugin/PanoOperation.cpp:149 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -483,7 +483,7 @@ msgid "Add images" msgstr "ÐобавÑне на изобÑажениÑ" -#: hugin1/calibrate_lens/LensCalFrame.cpp:493 hugin1/hugin/MainFrame.cpp:1095 +#: hugin1/calibrate_lens/LensCalFrame.cpp:493 hugin1/hugin/MainFrame.cpp:1069 msgid "Add Image: cancel" msgstr "ÐобавÑне на изобÑажение: оÑказ" @@ -529,15 +529,15 @@ msgstr "" #: hugin1/calibrate_lens/LensCalFrame.cpp:749 -#: hugin1/calibrate_lens/LensCalFrame.cpp:814 hugin1/hugin/MainFrame.cpp:892 +#: hugin1/calibrate_lens/LensCalFrame.cpp:814 hugin1/hugin/MainFrame.cpp:866 #: hugin1/hugin/MaskEditorPanel.cpp:443 #, c-format msgid "File %s exists. Overwrite?" msgstr "ФайлÑÑ %s веÑе ÑÑÑеÑÑвÑва. Ðа Ñе пÑезапиÑе ли?" #: hugin1/calibrate_lens/LensCalFrame.cpp:750 -#: hugin1/calibrate_lens/LensCalFrame.cpp:815 hugin1/hugin/MainFrame.cpp:893 -#: translations/xrc.cpp:428 xrc.cpp:428 +#: hugin1/calibrate_lens/LensCalFrame.cpp:815 hugin1/hugin/MainFrame.cpp:867 +#: translations/xrc.cpp:425 xrc.cpp:425 msgid "Save project" msgstr "Ðапазване на пÑоекÑ" @@ -564,17 +564,17 @@ msgid "Saving lens data" msgstr "ÐаÑеждане на данни на обекÑива..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:780 translations/xrc.cpp:272 -#: xrc.cpp:272 +#: hugin1/calibrate_lens/LensCalFrame.cpp:780 translations/xrc.cpp:269 +#: xrc.cpp:269 #, fuzzy msgid "Save lens" msgstr "Ðапазване на обекÑив..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:803 hugin1/hugin/MainFrame.cpp:880 +#: hugin1/calibrate_lens/LensCalFrame.cpp:803 hugin1/hugin/MainFrame.cpp:854 msgid "Save project file" msgstr "Ðапазване на пÑоекÑен Ñайл" -#: hugin1/calibrate_lens/LensCalFrame.cpp:804 hugin1/hugin/MainFrame.cpp:882 +#: hugin1/calibrate_lens/LensCalFrame.cpp:804 hugin1/hugin/MainFrame.cpp:856 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "ÐÑоекÑни Ñайлове (*.pto)|*.pto|ÐÑиÑки Ñайлове (*)|*" @@ -743,13 +743,12 @@ msgstr "Ðе е оÑкÑиÑа ÑÑ Ð¾Ð´Ð½Ð° ÑоÑка" #: hugin1/hugin/CPEditorPanel.cpp:974 hugin1/hugin/CPEditorPanel.cpp:987 -#: hugin1/hugin/GLPreviewFrame.cpp:2937 hugin1/hugin/huginApp.cpp:245 -#: hugin1/hugin/huginApp.cpp:259 hugin1/hugin/ImagesPanel.cpp:578 -#: hugin1/hugin/ImagesPanel.cpp:608 hugin1/hugin/MainFrame.cpp:716 -#: hugin1/hugin/MainFrame.cpp:1029 hugin1/hugin/OptimizePanel.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 hugin1/hugin/ImagesPanel.cpp:578 +#: hugin1/hugin/ImagesPanel.cpp:608 hugin1/hugin/MainFrame.cpp:690 +#: hugin1/hugin/MainFrame.cpp:1003 hugin1/hugin/OptimizePanel.cpp:171 #: hugin1/hugin/OptimizePhotometricPanel.cpp:153 #: hugin1/hugin/PanoOperation.cpp:368 hugin1/hugin/PanoPanel.cpp:1419 -#: hugin1/hugin/PanoPanel.cpp:1447 translations/xrc.cpp:336 xrc.cpp:336 +#: hugin1/hugin/PanoPanel.cpp:1447 translations/xrc.cpp:333 xrc.cpp:333 #, fuzzy msgid "Hugin" msgstr "УнгаÑÑки" @@ -786,7 +785,7 @@ #: hugin1/hugin/CPEditorPanel.cpp:1258 hugin1/hugin/CPListFrame.cpp:427 #: hugin1/hugin/GLPreviewFrame.cpp:660 hugin1/hugin/GLPreviewFrame.cpp:2994 -#: hugin1/hugin/PreviewFrame.cpp:234 translations/xrc.cpp:153 xrc.cpp:153 +#: hugin1/hugin/PreviewFrame.cpp:234 translations/xrc.cpp:152 xrc.cpp:152 msgid "normal" msgstr "ÐоÑмален" @@ -818,7 +817,7 @@ msgstr "ÐÑаг за опÑеделÑне на ÑгÑла" #: hugin1/hugin/CPEditorPanel.cpp:1578 hugin1/hugin/CPEditorPanel.cpp:1582 -#: translations/xrc.cpp:195 xrc.cpp:195 +#: translations/xrc.cpp:194 xrc.cpp:194 msgid "Create control points" msgstr "СÑздаване на конÑÑолни ÑоÑки" @@ -863,7 +862,7 @@ msgid "Loading model file" msgstr "ÐаÑеждане на изобÑажениеÑо %s" -#: hugin1/hugin/CPEditorPanel.cpp:1837 hugin1/hugin/MainFrame.cpp:1696 +#: hugin1/hugin/CPEditorPanel.cpp:1837 hugin1/hugin/MainFrame.cpp:1670 #, fuzzy, c-format msgid "Removed %d control points" msgstr "Ðобавени конÑÑолни ÑоÑки: %d" @@ -959,40 +958,40 @@ msgid "Fast Panorama preview" msgstr "ÐÑедваÑиÑелен пÑеглед" -#: hugin1/hugin/GLPreviewFrame.cpp:385 translations/xrc.cpp:794 -#: translations/xrc.cpp:942 xrc.cpp:794 xrc.cpp:942 +#: hugin1/hugin/GLPreviewFrame.cpp:385 translations/xrc.cpp:791 +#: translations/xrc.cpp:939 xrc.cpp:791 xrc.cpp:939 msgid "Center" msgstr "ЦенÑÑално" #: hugin1/hugin/GLPreviewFrame.cpp:386 hugin1/hugin/GLPreviewFrame.cpp:388 -#: translations/xrc.cpp:797 translations/xrc.cpp:930 translations/xrc.cpp:944 -#: xrc.cpp:797 xrc.cpp:930 xrc.cpp:944 +#: translations/xrc.cpp:794 translations/xrc.cpp:927 translations/xrc.cpp:941 +#: xrc.cpp:794 xrc.cpp:927 xrc.cpp:941 msgid "Fit" msgstr "ÐмеÑÑване" -#: hugin1/hugin/GLPreviewFrame.cpp:387 translations/xrc.cpp:799 -#: translations/xrc.cpp:946 xrc.cpp:799 xrc.cpp:946 +#: hugin1/hugin/GLPreviewFrame.cpp:387 translations/xrc.cpp:796 +#: translations/xrc.cpp:943 xrc.cpp:796 xrc.cpp:943 msgid "Straighten" msgstr "ÐзÑавнÑване" #: hugin1/hugin/GLPreviewFrame.cpp:389 hugin1/hugin/GLPreviewFrame.cpp:2541 #: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/PanoPanel.cpp:975 -#: translations/xrc.cpp:966 xrc.cpp:966 +#: translations/xrc.cpp:963 xrc.cpp:963 #, fuzzy msgid "Autocrop" msgstr "ÐвÑо" -#: hugin1/hugin/GLPreviewFrame.cpp:390 translations/xrc.cpp:968 xrc.cpp:968 +#: hugin1/hugin/GLPreviewFrame.cpp:390 translations/xrc.cpp:965 xrc.cpp:965 #, fuzzy msgid "HDR Autocrop" msgstr "ÐвÑо" #: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/GLPreviewFrame.cpp:3040 -#: hugin1/hugin/MainFrame.cpp:360 hugin1/hugin/MainFrame.cpp:2113 -#: hugin1/hugin/MainFrame.cpp:2130 translations/xrc.cpp:64 -#: translations/xrc.cpp:283 translations/xrc.cpp:411 translations/xrc.cpp:421 -#: translations/xrc.cpp:1026 xrc.cpp:64 xrc.cpp:283 xrc.cpp:411 xrc.cpp:421 -#: xrc.cpp:1026 +#: hugin1/hugin/MainFrame.cpp:360 hugin1/hugin/MainFrame.cpp:2087 +#: hugin1/hugin/MainFrame.cpp:2104 translations/xrc.cpp:63 +#: translations/xrc.cpp:280 translations/xrc.cpp:408 translations/xrc.cpp:418 +#: translations/xrc.cpp:1023 xrc.cpp:63 xrc.cpp:280 xrc.cpp:408 xrc.cpp:418 +#: xrc.cpp:1023 msgid "&File" msgstr "Файл" @@ -1001,17 +1000,17 @@ msgstr "показвани изобÑажениÑ" #: hugin1/hugin/GLPreviewFrame.cpp:439 hugin1/hugin/GLPreviewFrame.cpp:452 -#: translations/xrc.cpp:807 xrc.cpp:807 +#: translations/xrc.cpp:804 xrc.cpp:804 msgid "All" msgstr "ÐÑиÑки" #: hugin1/hugin/GLPreviewFrame.cpp:447 hugin1/hugin/GLPreviewFrame.cpp:453 -#: hugin1/hugin/ImagesPanel.cpp:630 translations/xrc.cpp:571 -#: translations/xrc.cpp:576 translations/xrc.cpp:720 translations/xrc.cpp:809 -#: translations/xrc.cpp:852 translations/xrc.cpp:864 translations/xrc.cpp:883 -#: translations/xrc.cpp:935 translations/xrc.cpp:950 translations/xrc.cpp:971 -#: xrc.cpp:571 xrc.cpp:576 xrc.cpp:720 xrc.cpp:809 xrc.cpp:852 xrc.cpp:864 -#: xrc.cpp:883 xrc.cpp:935 xrc.cpp:950 xrc.cpp:971 +#: hugin1/hugin/ImagesPanel.cpp:630 translations/xrc.cpp:568 +#: translations/xrc.cpp:573 translations/xrc.cpp:717 translations/xrc.cpp:806 +#: translations/xrc.cpp:849 translations/xrc.cpp:861 translations/xrc.cpp:880 +#: translations/xrc.cpp:932 translations/xrc.cpp:947 translations/xrc.cpp:968 +#: xrc.cpp:568 xrc.cpp:573 xrc.cpp:717 xrc.cpp:806 xrc.cpp:849 xrc.cpp:861 +#: xrc.cpp:880 xrc.cpp:932 xrc.cpp:947 xrc.cpp:968 msgid "None" msgstr "Ðез" @@ -1035,9 +1034,9 @@ msgid "drag to change the horizontal field of view" msgstr "ÐздÑÑпайÑе Ñ Ð¼Ð¸ÑкаÑа за да пÑомениÑе Ñ Ð¾ÑизонÑалноÑо зÑиÑелно поле" -#: hugin1/hugin/GLPreviewFrame.cpp:589 translations/xrc.cpp:279 -#: translations/xrc.cpp:450 translations/xrc.cpp:843 translations/xrc.cpp:925 -#: xrc.cpp:279 xrc.cpp:450 xrc.cpp:843 xrc.cpp:925 +#: hugin1/hugin/GLPreviewFrame.cpp:589 translations/xrc.cpp:276 +#: translations/xrc.cpp:447 translations/xrc.cpp:840 translations/xrc.cpp:922 +#: xrc.cpp:276 xrc.cpp:447 xrc.cpp:840 xrc.cpp:922 msgid "Preview" msgstr "ÐÑедваÑиÑелен пÑеглед" @@ -1419,24 +1418,6 @@ msgid "The crop factor must be positive." msgstr "ÐоеÑиÑиенÑÑÑ Ð½Ð° оÑÑÑзване ÑÑÑбва да е положиÑелно ÑиÑло." -#: hugin1/hugin/huginApp.cpp:243 -#, c-format -msgid "" -"I am Hugin version %s. I have found preferences from an older version %s. I " -"might not be compatible with the older preferences. If you experience " -"malfunction, please select \"Preferences\" from the menu and in each tab hit " -"the 'Load Defaults' button" -msgstr "" - -#: hugin1/hugin/huginApp.cpp:257 -#, c-format -msgid "" -"I am Hugin version %s. I have found preferences from a newer version %s. I " -"might not be compatible with the newer preferences. If you experience " -"malfunction, please select \"Preferences\" from the menu and in each tab hit " -"the 'Load Defaults' button" -msgstr "" - #: hugin1/hugin/ImagesList.cpp:455 hugin1/hugin/ImagesList.cpp:515 #: hugin1/hugin/ImagesTree.cpp:141 msgid "Filename" @@ -1448,8 +1429,8 @@ msgstr "ÐÑой пÑоÑеÑоÑи:" #: hugin1/hugin/ImagesList.cpp:457 hugin1/hugin/ImagesList.cpp:517 -#: translations/xrc.cpp:485 translations/xrc.cpp:896 translations/xrc.cpp:984 -#: xrc.cpp:485 xrc.cpp:896 xrc.cpp:984 +#: translations/xrc.cpp:482 translations/xrc.cpp:893 translations/xrc.cpp:981 +#: xrc.cpp:482 xrc.cpp:893 xrc.cpp:981 msgid "Crop" msgstr "ÐÑÑÑзване" @@ -1486,7 +1467,7 @@ msgid "The maximum Ev difference have to be greater than 0." msgstr "" -#: hugin1/hugin/ImagesPanel.cpp:638 hugin1/hugin/ImagesTree.cpp:1171 +#: hugin1/hugin/ImagesPanel.cpp:638 hugin1/hugin/ImagesTree.cpp:1173 msgid "Stacks" msgstr "" @@ -1582,12 +1563,14 @@ msgstr "ÐоÑÑебиÑелÑки инÑеÑÑейÑ" #: hugin1/hugin/ImagesTree.cpp:142 -msgid "width" -msgstr "ШиÑина" +#, fuzzy +msgid "Width" +msgstr "ÑиÑина:" #: hugin1/hugin/ImagesTree.cpp:143 -msgid "height" -msgstr "ÐиÑоÑина" +#, fuzzy +msgid "Height" +msgstr "виÑоÑина:" #: hugin1/hugin/ImagesTree.cpp:144 msgid "Anchor" @@ -1602,8 +1585,18 @@ msgstr "â на обекÑива" #: hugin1/hugin/ImagesTree.cpp:147 -msgid "Stack Number" -msgstr "" +msgid "Stack no." +msgstr "" + +#: hugin1/hugin/ImagesTree.cpp:149 +#, fuzzy |