Hi there.
While working on the translation I noticed several possible i18n
related improvements on hugin. I prepared patches for all issues
I've found, but before commiting them to trunk, I decided to send
them to the list.
They're all trivial, but I prefer to have the blessing of someone
more experienced with the project, as I've been away from hugin
for a while.
To ease the reviewer's job and avoid a flood on the list, below
are the patches changelogs and attached the full diff
(generated by git, which I use as a frontend to SVN). Please let
me know which ones are welcome and which ones are not so that I
can add them to the repos. I can also backport any changes to any
branch if someone wants that.
After applying these patches I plan to update the translators
guide on the wiki.
Thanks!
- Ademar
commit 3a0352f
i18n: filter out non-translatable strings when extracting strings from xrc
files
This should make the translators job far easier.
src/translations/README.txt | 5 +++-
src/translations/extract-messages.sh | 4 +++
src/translations/filter-ignored-strings.py | 14 +++++++++++++
src/translations/ignored-strings.txt | 30 ++++++++++++++++++++++++++++
4 files changed, 52 insertions(+), 1 deletions(-)
commit 0105f7c
Fix xgettext warning about _("") call
Warning message was:
warning: Empty msgid. It is reserved by GNU gettext:
gettext("") returns the header entry with
meta information, not the empty string.
src/hugin1/hugin/GLPreviewFrame.cpp | 2 +-
src/hugin1/hugin/PanoPanel.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 20ed719
Standardize tooltips 1: Capitalize sentences
src/hugin1/hugin/xrc/assistant_panel.xrc | 2 +-
src/hugin1/hugin/xrc/cp_editor_panel.xrc | 4 ++--
src/hugin1/hugin/xrc/images_panel.xrc | 14 +++++++-------
3 files changed, 10 insertions(+), 10 deletions(-)
commit ebcff35
Standardize tooltips 2: Remove period from the end of sentences
src/hugin1/hugin/xrc/assistant_panel.xrc | 2 +-
src/hugin1/hugin/xrc/optimize_panel.xrc | 2 +-
src/hugin1/hugin/xrc/optimize_photo_panel.xrc | 2 +-
src/hugin1/hugin/xrc/pano_panel.xrc | 6 +++---
src/hugin1/hugin/xrc/pref_dialog.xrc | 2 +-
src/hugin1/hugin/xrc/preview_frame.xrc | 6 +++---
6 files changed, 10 insertions(+), 10 deletions(-)
commit b5b2bfb
Images Panel: use Camera {Maker,Model} instead of Maker/Model
We have screen space available, so no need to save on these.
src/hugin1/hugin/xrc/images_panel.xrc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 43b5265
Preferences dialog: Minor typo
src/hugin1/hugin/xrc/pref_dialog.xrc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 34f0fcc
Preferences dialog: minor textual improvement
src/hugin1/hugin/xrc/pref_dialog.xrc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 671fd56
Preferences dialog: s/Tempdir/Temporary dir/
Changing the html help reference as well.
.../xrc/data/help_en_EN/Hugin_Preferences.html | 2 +-
src/hugin1/hugin/xrc/pref_dialog.xrc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 740a33b
i18n: don't i18n lens single-char variables
This should ease translators life a bit (and there's no translation
changing these variables anyway).
src/hugin1/hugin/ImagesList.cpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
commit 91823a0
i18n: Don't i18n "0123456...." placeholder string
src/hugin1/base_wx/PTWXDlg.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 7a5beea
i18n: Don't i18n "\n\n\n" string
src/hugin1/base_wx/PTWXDlg.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit c877803 (ademar)
i18n: Update .po files to reflect latest changes
src/translations/bg.po | 1625 +++++++++++-----------
src/translations/ca_ES.po | 1521 +++++++++-----------
src/translations/cs_CZ.po | 1608 ++++++++++-----------
src/translations/de.po | 1608 ++++++++++-----------
src/translations/en_GB.po | 1408 ++++++++----------
src/translations/es.po | 1615 ++++++++++-----------
src/translations/fr.po | 1618 +++++++++++-----------
src/translations/hu.po | 1608 ++++++++++-----------
src/translations/hugin.pot | 1405 ++++++++----------
src/translations/it.po | 1618 +++++++++++-----------
src/translations/ja.po | 1609 ++++++++++-----------
src/translations/ko.po | 1612 ++++++++++-----------
src/translations/nl.po | 1608 ++++++++++-----------
src/translations/pl.po | 1612 ++++++++++-----------
src/translations/pt_BR.po | 3435 +++++++++++++++++---------------------------
src/translations/ru.po | 1624 +++++++++++-----------
src/translations/sk.po | 1608 ++++++++++-----------
src/translations/sl.po | 1612 ++++++++++-----------
src/translations/sv.po | 1608 ++++++++++-----------
src/translations/uk.po | 1566 ++++++++++-----------
src/translations/zh_CN.po | 1608 ++++++++++-----------
src/translations/zh_TW.po | 1608 ++++++++++-----------
22 files changed, 17604 insertions(+), 19140 deletions(-)
--
Ademar de Souza Reis Jr. <[email protected]>
http://www.ademar.org/ || http://blog.ademar.org/
^[:wq!
--
You received this message because you are subscribed to the Google Groups
"hugin and other free panoramic software" group.
A list of frequently asked questions is available at:
http://wiki.panotools.org/Hugin_FAQ
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at http://groups.google.com/group/hugin-ptx>From 3a0352f525ac80456ba479266b4f00e4f4d6731c Mon Sep 17 00:00:00 2001
From: Ademar de Souza Reis Jr <[email protected]>
Date: Thu, 10 Dec 2009 21:06:11 -0300
Subject: [PATCH 01/12] i18n: filter out non-translatable strings when
extracting strings from xrc files
This should make the translators job far easier.
Signed-off-by: Ademar de Souza Reis Jr <[email protected]>
---
src/translations/README.txt | 5 +++-
src/translations/extract-messages.sh | 4 +++
src/translations/filter-ignored-strings.py | 14 +++++++++++++
src/translations/ignored-strings.txt | 30 ++++++++++++++++++++++++++++
4 files changed, 52 insertions(+), 1 deletions(-)
create mode 100755 src/translations/filter-ignored-strings.py
create mode 100644 src/translations/ignored-strings.txt
diff --git a/src/translations/README.txt b/src/translations/README.txt
index 63b7370..f7fe422 100644
--- a/src/translations/README.txt
+++ b/src/translations/README.txt
@@ -4,5 +4,8 @@ their own .po files. This has been changed, and all
translateable messages are
now in hugin.pot, located in this directory.
To update the hugin.pot and the translation with new strings found in the
-source code, run the extract-messages.sh script.
+source code, run the extract-messages.sh script.
+
+To ignore a particular string from the xrc files, add it to the
+ignored-strings.txt file.
diff --git a/src/translations/extract-messages.sh
b/src/translations/extract-messages.sh
index 44615fe..7aa3c75 100755
--- a/src/translations/extract-messages.sh
+++ b/src/translations/extract-messages.sh
@@ -13,6 +13,10 @@ find . -name '*.xrc' | sort | while read line; do wxrc -g
$line >> ${WDIR}/xrc.c
cd ${WDIR}
echo "Done preparing rc files"
+echo "Filtering out ignored strings"
+./filter-ignored-strings.py
+mv -f xrc-filtered.cpp xrc.cpp
+echo "Done filtering"
echo "Extracting messages"
cd ${BASEDIR}
diff --git a/src/translations/filter-ignored-strings.py
b/src/translations/filter-ignored-strings.py
new file mode 100755
index 0000000..8e4abab
--- /dev/null
+++ b/src/translations/filter-ignored-strings.py
@@ -0,0 +1,14 @@
+#!/bin/env python
+
+ignored = []
+for line in open("ignored-strings.txt"):
+ ignored.append(line)
+
+filtered = []
+for string in open("xrc.cpp"):
+ if string not in ignored:
+ filtered.append(string)
+
+output = open("xrc-filtered.cpp", "w")
+for string in filtered:
+ output.write(string)
diff --git a/src/translations/ignored-strings.txt
b/src/translations/ignored-strings.txt
new file mode 100644
index 0000000..02e2803
--- /dev/null
+++ b/src/translations/ignored-strings.txt
@@ -0,0 +1,30 @@
+_("100%");
+_("150%");
+_("200%");
+_("25%");
+_("50%");
+_("75%");
+_("a0123456789012345678901234567890123456789\nb\nc\nd\ne");
+_("mm");
+_(" + ");
+_("...");
+_("* r^2");
+_("*r^2 + ");
+_("* r^4");
+_("*r^4 + ");
+_("* r^6");
+_("*r^6");
+_("c = ");
+_("x:");
+_("x");
+_("y:");
+_("Nona");
+_("PTStitcher:");
+_("Autopano-SIFT");
+_("Deflate");
+_("EXR");
+_("LZW");
+_("MB");
+_("TIFF");
+_("JPEG");
+_("PNG");
--
1.6.5.2
>From 0105f7cd3b5742b9f2d6093e44125bdcd97819f0 Mon Sep 17 00:00:00 2001
From: Ademar de Souza Reis Jr <[email protected]>
Date: Thu, 10 Dec 2009 21:08:51 -0300
Subject: [PATCH 02/12] Fix xgettext warning about _("") call
Warning message was:
warning: Empty msgid. It is reserved by GNU gettext:
gettext("") returns the header entry with
meta information, not the empty string.
Signed-off-by: Ademar de Souza Reis Jr <[email protected]>
---
src/hugin1/hugin/GLPreviewFrame.cpp | 2 +-
src/hugin1/hugin/PanoPanel.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/hugin1/hugin/GLPreviewFrame.cpp
b/src/hugin1/hugin/GLPreviewFrame.cpp
index 49142bf..140c7a3 100644
--- a/src/hugin1/hugin/GLPreviewFrame.cpp
+++ b/src/hugin1/hugin/GLPreviewFrame.cpp
@@ -1251,7 +1251,7 @@ void GLPreviewFrame::FillBlendChoice()
void GLPreviewFrame::OnAutocrop(wxCommandEvent &e)
{
- wxProgressDialog progress(_(""), _("Calculating optimal crop"), 100, this);
+ wxProgressDialog progress(wxT(""), _("Calculating optimal crop"), 100,
this);
progress.Pulse();
DEBUG_INFO("Dirty ROI Calc\n");
diff --git a/src/hugin1/hugin/PanoPanel.cpp b/src/hugin1/hugin/PanoPanel.cpp
index e2ac67f..96f9901 100644
--- a/src/hugin1/hugin/PanoPanel.cpp
+++ b/src/hugin1/hugin/PanoPanel.cpp
@@ -915,7 +915,7 @@ void PanoPanel::DoCalcOptimalWidth(wxCommandEvent & e)
void PanoPanel::DoCalcOptimalROI(wxCommandEvent & e)
{
- wxProgressDialog progress(_(""), _("Calculating optimal crop"), 100,
GetParent()->GetParent());
+ wxProgressDialog progress(wxT(""), _("Calculating optimal crop"), 100,
GetParent()->GetParent());
progress.Pulse();
//DoCalcOptimalWidth(e);
printf("Dirty ROI Calc\n");
--
1.6.5.2
>From 20ed719c4c5094fe68f98fa9634a08380e339d62 Mon Sep 17 00:00:00 2001
From: Ademar de Souza Reis Jr <[email protected]>
Date: Thu, 10 Dec 2009 21:19:11 -0300
Subject: [PATCH 03/12] Standardize tooltips 1: Capitalize sentences
Signed-off-by: Ademar de Souza Reis Jr <[email protected]>
---
src/hugin1/hugin/xrc/assistant_panel.xrc | 2 +-
src/hugin1/hugin/xrc/cp_editor_panel.xrc | 4 ++--
src/hugin1/hugin/xrc/images_panel.xrc | 14 +++++++-------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/hugin1/hugin/xrc/assistant_panel.xrc
b/src/hugin1/hugin/xrc/assistant_panel.xrc
index f5c1e9e..edd335c 100644
--- a/src/hugin1/hugin/xrc/assistant_panel.xrc
+++ b/src/hugin1/hugin/xrc/assistant_panel.xrc
@@ -15,7 +15,7 @@
<object class="sizeritem">
<object class="wxButton" name="ass_load_images_button">
<label>1. Load images...</label>
- <tooltip>load a series of photos</tooltip>
+ <tooltip>Load a series of images</tooltip>
</object>
<flag>wxBOTTOM</flag>
<border>12</border>
diff --git a/src/hugin1/hugin/xrc/cp_editor_panel.xrc
b/src/hugin1/hugin/xrc/cp_editor_panel.xrc
index 58b46b0..90242a4 100644
--- a/src/hugin1/hugin/xrc/cp_editor_panel.xrc
+++ b/src/hugin1/hugin/xrc/cp_editor_panel.xrc
@@ -239,7 +239,7 @@
<object class="sizeritem">
<object class="wxButton"
name="cp_editor_finetune_button">
<label>Fine-tune</label>
- <tooltip>tries to optimize the currently active
point.</tooltip>
+ <tooltip>Tries to optimize the currently active
point</tooltip>
</object>
<flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
<border>3</border>
@@ -247,7 +247,7 @@
<object class="sizeritem">
<object class="wxButton"
name="cp_editor_celeste_button">
<label>Celeste</label>
- <tooltip>tries to remove control points from
clouds.</tooltip>
+ <tooltip>Tries to remove control points from
clouds</tooltip>
</object>
<flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
<border>3</border>
diff --git a/src/hugin1/hugin/xrc/images_panel.xrc
b/src/hugin1/hugin/xrc/images_panel.xrc
index bdcde4d..d5afa89 100644
--- a/src/hugin1/hugin/xrc/images_panel.xrc
+++ b/src/hugin1/hugin/xrc/images_panel.xrc
@@ -29,14 +29,14 @@
<object class="sizeritem">
<object class="wxButton" name="action_add_images">
<label>Add individual images...</label>
- <tooltip>load one or more photos for this
project</tooltip>
+ <tooltip>Load one or more pictures for this
project</tooltip>
</object>
<flag>wxEXPAND</flag>
</object>
<object class="sizeritem">
<object class="wxButton"
name="action_add_time_images">
<label>Add time-series of images...</label>
- <tooltip>load a set of photos taken at the same
time</tooltip>
+ <tooltip>Load a set of pictures taken at the same
time</tooltip>
</object>
<flag>wxEXPAND</flag>
</object>
@@ -158,7 +158,7 @@
<object class="wxTextCtrl"
name="images_text_yaw">
<size>50,-1</size>
<style>wxTE_PROCESS_ENTER</style>
- <tooltip>set yaw for selected
image(s)</tooltip>
+ <tooltip>Set yaw for selected
image(s)</tooltip>
</object>
<flag>wxALIGN_CENTRE_VERTICAL</flag>
</object>
@@ -172,7 +172,7 @@
<object class="wxTextCtrl"
name="images_text_pitch">
<size>50,-1</size>
<style>wxTE_PROCESS_ENTER</style>
- <tooltip>set pitch for selected
image(s)</tooltip>
+ <tooltip>Set pitch for selected
image(s)</tooltip>
</object>
<flag>wxALIGN_CENTRE_VERTICAL</flag>
</object>
@@ -186,7 +186,7 @@
<object class="wxTextCtrl"
name="images_text_roll">
<size>50,-1</size>
<style>wxTE_PROCESS_ENTER</style>
- <tooltip>set roll for selected
image(s)</tooltip>
+ <tooltip>Set roll for selected
image(s)</tooltip>
</object>
<flag>wxALIGN_CENTRE_VERTICAL</flag>
</object>
@@ -318,7 +318,7 @@
<object class="wxButton"
name="images_opt_anchor_button">
<label>Anchor this image for position</label>
<style></style>
- <tooltip>use currently selected image as
anchor image. That is, do not optimize the (complete) position of this
image.</tooltip>
+ <tooltip>Use currently selected image as
anchor image. That is, do not optimize the (complete) position of this
image</tooltip>
</object>
<flag>wxEXPAND</flag>
</object>
@@ -326,7 +326,7 @@
<object class="wxButton"
name="images_color_anchor_button">
<label>Anchor this image for exposure</label>
<enabled>0</enabled>
- <tooltip>use the currently selected images as
color correction anchor image</tooltip>
+ <tooltip>Use the currently selected images as
color correction anchor image</tooltip>
</object>
<flag>wxEXPAND</flag>
</object>
--
1.6.5.2
>From ebcff35841fe05ba2e0a1eaec4547c293d799bb9 Mon Sep 17 00:00:00 2001
From: Ademar de Souza Reis Jr <[email protected]>
Date: Thu, 10 Dec 2009 21:20:45 -0300
Subject: [PATCH 04/12] Standardize tooltips 2: Remove period from the end of
sentences
Signed-off-by: Ademar de Souza Reis Jr <[email protected]>
---
src/hugin1/hugin/xrc/assistant_panel.xrc | 2 +-
src/hugin1/hugin/xrc/optimize_panel.xrc | 2 +-
src/hugin1/hugin/xrc/optimize_photo_panel.xrc | 2 +-
src/hugin1/hugin/xrc/pano_panel.xrc | 6 +++---
src/hugin1/hugin/xrc/pref_dialog.xrc | 2 +-
src/hugin1/hugin/xrc/preview_frame.xrc | 6 +++---
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/hugin1/hugin/xrc/assistant_panel.xrc
b/src/hugin1/hugin/xrc/assistant_panel.xrc
index edd335c..f349fcc 100644
--- a/src/hugin1/hugin/xrc/assistant_panel.xrc
+++ b/src/hugin1/hugin/xrc/assistant_panel.xrc
@@ -165,7 +165,7 @@
<object class="sizeritem">
<object class="wxButton" name="ass_create_button">
<label>3. Create panorama...</label>
- <tooltip>Create a high resolution panorama.</tooltip>
+ <tooltip>Create a high resolution panorama</tooltip>
</object>
</object>
<orient>wxVERTICAL</orient>
diff --git a/src/hugin1/hugin/xrc/optimize_panel.xrc
b/src/hugin1/hugin/xrc/optimize_panel.xrc
index 834d9ed..4c61a1f 100644
--- a/src/hugin1/hugin/xrc/optimize_panel.xrc
+++ b/src/hugin1/hugin/xrc/optimize_panel.xrc
@@ -88,7 +88,7 @@ Variables which are cleared [ ] will act as references or
anchors.</label>
<object class="wxCheckBox"
name="optimizer_only_active_images">
<label>Only use control points between image selected in
preview window.</label>
<checked>0</checked>
- <tooltip>Only use control points between images selected
in preview window. Useful to avoid errors due to badly fitting images, such as
the nadir image in most fisheye panoramas.</tooltip>
+ <tooltip>Only use control points between images selected
in preview window. Useful to avoid errors due to badly fitting images, such as
the nadir image in most fisheye panoramas</tooltip>
</object>
<flag>wxLEFT|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
<border>12</border>
diff --git a/src/hugin1/hugin/xrc/optimize_photo_panel.xrc
b/src/hugin1/hugin/xrc/optimize_photo_panel.xrc
index 5617039..e1073fa 100644
--- a/src/hugin1/hugin/xrc/optimize_photo_panel.xrc
+++ b/src/hugin1/hugin/xrc/optimize_photo_panel.xrc
@@ -330,6 +330,6 @@ Variables which are cleared [ ] will act as references or
anchors.</label>
</object>
</object>
<style>wxTAB_TRAVERSAL</style>
- <tooltip>Only use pixels from images selected in preview window. Useful to
avoid errors due to badly aligned images (for example, the nadir image in a
fisheye panorama).</tooltip>
+ <tooltip>Only use pixels from images selected in preview window. Useful to
avoid errors due to badly aligned images (for example, the nadir image in a
fisheye panorama)</tooltip>
</object>
</resource>
diff --git a/src/hugin1/hugin/xrc/pano_panel.xrc
b/src/hugin1/hugin/xrc/pano_panel.xrc
index 338a429..3f3143c 100644
--- a/src/hugin1/hugin/xrc/pano_panel.xrc
+++ b/src/hugin1/hugin/xrc/pano_panel.xrc
@@ -36,7 +36,7 @@
<object class="sizeritem">
<object class="wxCheckBox" name="nona_save_cropped">
<label>Save cropped images</label>
- <tooltip>Save cropped tiff output. Useful for enblend 2.4 and
higher.</tooltip>
+ <tooltip>Save cropped tiff output. Useful for enblend 2.4 and
higher</tooltip>
</object>
<flag>wxBOTTOM|wxLEFT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
<border>6</border>
@@ -323,7 +323,7 @@
<object class="sizeritem">
<object class="wxButton" name="pano_button_opt_width">
<label>Calculate Optimal Size</label>
- <tooltip>Calculate optimal image size, such that the
resolution in the image center stays similar.</tooltip>
+ <tooltip>Calculate optimal image size, such that the
resolution in the image center stays similar</tooltip>
</object>
<flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
<cellpos>3,4</cellpos>
@@ -446,7 +446,7 @@
<object class="sizeritem">
<object class="wxButton" name="pano_button_opt_roi">
<label>Autocrop</label>
- <tooltip>Calculate crop borders such that the final
images has the largest area without excess.</tooltip>
+ <tooltip>Calculate crop borders such that the final
images has the largest area without excess</tooltip>
</object>
<flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
<cellpos>3,4</cellpos>
diff --git a/src/hugin1/hugin/xrc/pref_dialog.xrc
b/src/hugin1/hugin/xrc/pref_dialog.xrc
index 527e8ee..228a1ed 100644
--- a/src/hugin1/hugin/xrc/pref_dialog.xrc
+++ b/src/hugin1/hugin/xrc/pref_dialog.xrc
@@ -54,7 +54,7 @@
<object class="wxSpinCtrl"
name="prefs_nona_NumberOfThreads">
<value>1</value>
<min>1</min>
- <tooltip>Nona can use multiple threads for
processing.\nSet this to the number of processors or processor cores available
in your system.</tooltip>
+ <tooltip>Nona can use multiple threads for
processing.\nSet this to the number of processors or processor cores available
in your system</tooltip>
</object>
<flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
<border>5</border>
diff --git a/src/hugin1/hugin/xrc/preview_frame.xrc
b/src/hugin1/hugin/xrc/preview_frame.xrc
index 5117352..3e23a0a 100644
--- a/src/hugin1/hugin/xrc/preview_frame.xrc
+++ b/src/hugin1/hugin/xrc/preview_frame.xrc
@@ -85,7 +85,7 @@
</object>
<object class="tool" name="preview_straighten_pano_tool">
<bitmap>data/straighten_pano.png</bitmap>
- <tooltip>Automatically straighten a wavy horizon.</tooltip>
+ <tooltip>Automatically straighten a wavy horizon</tooltip>
<label>Straighten</label>
</object>
<object class="tool" name="preview_num_transform">
@@ -140,7 +140,7 @@
</object>
<object class="tool" name="preview_straighten_pano_tool">
<bitmap>data/straighten_pano.png</bitmap>
- <tooltip>Automatically straighten a wavy horizon.</tooltip>
+ <tooltip>Automatically straighten a wavy horizon</tooltip>
<label>Straighten</label>
</object>
<object class="tool" name="preview_num_transform">
@@ -188,7 +188,7 @@
<object class="tool" name="preview_control_point_tool">
<toggle>1</toggle>
<bitmap>data/preview_control_point_tool.png</bitmap>
- <tooltip>Show lines between the ends of each control point. The longer
the line, the bigger the error.</tooltip>
+ <tooltip>Show lines between the ends of each control point. The longer
the line, the bigger the error</tooltip>
<label>Show control points</label>
</object>
<bitmapsize>22,22</bitmapsize>
--
1.6.5.2
>From b5b2bfbb8903be0f4d42c4fd50099625a797e85d Mon Sep 17 00:00:00 2001
From: Ademar de Souza Reis Jr <[email protected]>
Date: Thu, 10 Dec 2009 21:23:12 -0300
Subject: [PATCH 05/12] Images Panel: use Camera {Maker,Model} instead of
Maker/Model
We have screen space available, so no need to save on these.
Signed-off-by: Ademar de Souza Reis Jr <[email protected]>
---
src/hugin1/hugin/xrc/images_panel.xrc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/hugin1/hugin/xrc/images_panel.xrc
b/src/hugin1/hugin/xrc/images_panel.xrc
index d5afa89..5a5c8ef 100644
--- a/src/hugin1/hugin/xrc/images_panel.xrc
+++ b/src/hugin1/hugin/xrc/images_panel.xrc
@@ -385,7 +385,7 @@
</object>
<object class="sizeritem">
<object class="wxStaticText">
- <label>Make:</label>
+ <label>Camera Maker:</label>
</object>
</object>
<object class="sizeritem">
@@ -395,7 +395,7 @@
</object>
<object class="sizeritem">
<object class="wxStaticText">
- <label>Model:</label>
+ <label>Camera Model:</label>
</object>
</object>
<object class="sizeritem">
--
1.6.5.2
>From 43b5265b675527c6d96eb4c601c71da41cb3cdb8 Mon Sep 17 00:00:00 2001
From: Ademar de Souza Reis Jr <[email protected]>
Date: Thu, 10 Dec 2009 21:24:38 -0300
Subject: [PATCH 06/12] Preferences dialog: Minor typo
Signed-off-by: Ademar de Souza Reis Jr <[email protected]>
---
src/hugin1/hugin/xrc/pref_dialog.xrc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/hugin1/hugin/xrc/pref_dialog.xrc
b/src/hugin1/hugin/xrc/pref_dialog.xrc
index 228a1ed..5c26fd3 100644
--- a/src/hugin1/hugin/xrc/pref_dialog.xrc
+++ b/src/hugin1/hugin/xrc/pref_dialog.xrc
@@ -533,7 +533,7 @@ for HDR panoramas use Preview window.</label>
</object>
<object class="sizeritem">
<object class="wxStaticText">
- <label>0: no peak\n 0.2: distinctive peak</label>
+ <label>0: no peak\n0.2: distinctive peak</label>
<tooltip></tooltip>
</object>
<flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
--
1.6.5.2
>From 34f0fccbf6a27522d58fd4bfe1453c2d92b9dbce Mon Sep 17 00:00:00 2001
From: Ademar de Souza Reis Jr <[email protected]>
Date: Thu, 10 Dec 2009 21:27:54 -0300
Subject: [PATCH 07/12] Preferences dialog: minor textual improvement
Signed-off-by: Ademar de Souza Reis Jr <[email protected]>
---
src/hugin1/hugin/xrc/pref_dialog.xrc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/hugin1/hugin/xrc/pref_dialog.xrc
b/src/hugin1/hugin/xrc/pref_dialog.xrc
index 5c26fd3..2b15fd8 100644
--- a/src/hugin1/hugin/xrc/pref_dialog.xrc
+++ b/src/hugin1/hugin/xrc/pref_dialog.xrc
@@ -96,7 +96,7 @@
</object>
<object class="sizeritem">
<object class="wxStaticText">
- <label>requires restarting hugin</label>
+ <label>(requires restarting hugin)</label>
<style></style>
</object>
<flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
@@ -141,7 +141,7 @@
</object>
<object class="sizeritem">
<object class="wxStaticText">
- <label>leave empty for OS default</label>
+ <label>(leave empty for OS default)</label>
</object>
<flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
<border>5</border>
--
1.6.5.2
>From 671fd567f90c36cbc724d82e02646de37967c9ae Mon Sep 17 00:00:00 2001
From: Ademar de Souza Reis Jr <[email protected]>
Date: Thu, 10 Dec 2009 21:28:38 -0300
Subject: [PATCH 08/12] Preferences dialog: s/Tempdir/Temporary dir/
Changing the html help reference as well.
Signed-off-by: Ademar de Souza Reis Jr <[email protected]>
---
.../xrc/data/help_en_EN/Hugin_Preferences.html | 2 +-
src/hugin1/hugin/xrc/pref_dialog.xrc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html
b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html
index 748af41..67bb4ef 100644
--- a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html
+++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html
@@ -55,7 +55,7 @@ such as Windows95 that doesn't support localised software.
hugin won't change l
immediately, you will need to stop and restart it.
</p>
<a name="File_options" id="File_options"></a><h2> <span class="mw-headline">
File options </span></h2>
-<p>Some <a href="Hugin.html" title="Hugin">hugin</a> actions generate large
temporary files, change the <b>Tempdir</b> to
+<p>Some <a href="Hugin.html" title="Hugin">hugin</a> actions generate large
temporary files, change the <b>Temporary dir</b> to
specify an alternative location for writing these files. One reason for
setting this
independently from the operating system would be to use a RAM disk to speed up
stitching.
diff --git a/src/hugin1/hugin/xrc/pref_dialog.xrc
b/src/hugin1/hugin/xrc/pref_dialog.xrc
index 2b15fd8..74f16b2 100644
--- a/src/hugin1/hugin/xrc/pref_dialog.xrc
+++ b/src/hugin1/hugin/xrc/pref_dialog.xrc
@@ -128,7 +128,7 @@
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
<object class="wxStaticText">
- <label>Tempdir:</label>
+ <label>Temporary dir:</label>
</object>
<flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
<border>5</border>
--
1.6.5.2
>From 740a33b8e31a35a8b68384bbe72637c26fabd86c Mon Sep 17 00:00:00 2001
From: Ademar de Souza Reis Jr <[email protected]>
Date: Thu, 10 Dec 2009 21:12:36 -0300
Subject: [PATCH 09/12] i18n: don't i18n lens single-char variables
This should ease translators life a bit (and there's no translation
changing these variables anyway).
Signed-off-by: Ademar de Souza Reis Jr <[email protected]>
---
src/hugin1/hugin/ImagesList.cpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/hugin1/hugin/ImagesList.cpp b/src/hugin1/hugin/ImagesList.cpp
index a268d6b..0402e1f 100644
--- a/src/hugin1/hugin/ImagesList.cpp
+++ b/src/hugin1/hugin/ImagesList.cpp
@@ -450,13 +450,13 @@ bool ImagesListLens::Create(wxWindow* parent, wxWindowID
id,
InsertColumn( 3, _("Lens type (f)"), wxLIST_FORMAT_LEFT, 100 );
InsertColumn( 4, _("EV"), wxLIST_FORMAT_RIGHT, 50 );
InsertColumn( 5, _("hfov (v)"), wxLIST_FORMAT_RIGHT, 80 );
- InsertColumn( 6, _("a"), wxLIST_FORMAT_RIGHT, 40 );
- InsertColumn( 7, _("b"), wxLIST_FORMAT_RIGHT, 40 );
- InsertColumn( 8, _("c"), wxLIST_FORMAT_RIGHT, 40 );
- InsertColumn( 9, _("d"), wxLIST_FORMAT_RIGHT, 40 );
- InsertColumn( 10, _("e"), wxLIST_FORMAT_RIGHT, 40 );
- InsertColumn( 11, _("g"), wxLIST_FORMAT_RIGHT, 40 );
- InsertColumn( 12, _("t"), wxLIST_FORMAT_RIGHT, 40 );
+ InsertColumn( 6, wxT("a"), wxLIST_FORMAT_RIGHT, 40 );
+ InsertColumn( 7, wxT("b"), wxLIST_FORMAT_RIGHT, 40 );
+ InsertColumn( 8, wxT("c"), wxLIST_FORMAT_RIGHT, 40 );
+ InsertColumn( 9, wxT("d"), wxLIST_FORMAT_RIGHT, 40 );
+ InsertColumn( 10, wxT("e"), wxLIST_FORMAT_RIGHT, 40 );
+ InsertColumn( 11, wxT("g"), wxLIST_FORMAT_RIGHT, 40 );
+ InsertColumn( 12, wxT("t"), wxLIST_FORMAT_RIGHT, 40 );
//get saved width
for ( int j=0; j < GetColumnCount() ; j++ )
--
1.6.5.2
