SourceForge.net: Hugin: hugin-cvs

Home / Browse / Hugin / Mail / Archive

Email Archive: hugin-cvs (read-only)

2005:	_Jan (84)	_Feb (83)	_Mar (36)	_Apr (15)	_May (250)	_Jun (81)	_Jul (29)	_Aug (62)	_Sep (22)	_Oct (13)	_Nov (62)	_Dec (30)
2006:	_Jan (67)	_Feb (68)	_Mar (149)	_Apr (51)	_May (8)	_Jun (23)	_Jul (87)	_Aug (132)	_Sep (9)	_Oct (1)	_Nov (22)	_Dec (163)
2007:	_Jan (74)	_Feb (71)	_Mar (2)	_Apr (121)	_May (57)	_Jun (168)	_Jul (151)	_Aug (73)	_Sep (4)	_Oct (91)	_Nov (30)	_Dec (38)
2008:	_Jan (178)	_Feb (159)	_Mar (49)	_Apr (65)	_May (43)	_Jun (56)	_Jul (99)	_Aug (132)	_Sep (71)	_Oct (57)	_Nov (42)	_Dec (11)
2009:	_Jan (40)	_Feb (74)	_Mar (80)	_Apr (45)	_May (86)	_Jun (76)	_Jul (160)	_Aug (170)	_Sep (227)	_Oct (161)	_Nov (49)	_Dec (108)
2010:	_Jan (108)	_Feb (82)	_Mar (62)	_Apr (33)	_May (60)	_Jun (38)	_Jul (46)	_Aug (69)	_Sep (157)	_Oct (123)	_Nov (130)	_Dec (154)
2011:	_Jan (138)	_Feb (112)	_Mar (128)	_Apr (4)	_May (86)	_Jun (81)	_Jul (128)	_Aug (98)	_Sep (69)	_Oct (32)	_Nov (50)	_Dec (41)
2012:	_Jan (10)	_Feb (6)	_Mar (17)	_Apr (10)	_May (67)	_Jun (57)	_Jul (41)	_Aug (54)	_Sep (17)	_Oct (15)	_Nov (34)	_Dec (45)
2013:	_Jan (62)	_Feb (47)	_Mar (71)	_Apr (25)	_May (11)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec


S	M	T	W	T	F	S
1	2	3	4	5	6	7
(1)
8	9	10	11	12	13	14
(1)		(1)
15	16	17	18	19	20	21
			(2)		(4)	(2)
22	23	24	25	26	27	28
(5)	(6)	(3)	(12)			(2)
29	30	31
(2)

[Hugin-cvs] /hgroot/hugin/hugin: Try to remove progress window of optimizer ...

From: <hugin-cvs@li...> - 2012-07-29 10:18

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/3109f9ada42d
changeset:  5924:3109f9ada42d
user:       tmodes
date:       Sun Jul 29 12:18:12 2012 +0200
description:

Try to remove progress window of optimizer before showing the results

diffstat:

 src/hugin1/hugin/OptimizePanel.cpp |  6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diffs (16 lines):

diff -r 638a154412a6 -r 3109f9ada42d src/hugin1/hugin/OptimizePanel.cpp
--- a/src/hugin1/hugin/OptimizePanel.cpp	Sat Jul 28 17:15:42 2012 +0200
+++ b/src/hugin1/hugin/OptimizePanel.cpp	Sun Jul 29 12:18:12 2012 +0200
@@ -286,6 +286,12 @@
 
     setlocale(LC_ALL,oldlocale);
     free(oldlocale);
+#ifdef __WXMSW__
+    // the progress window of the optimizer is marked for deletion
+    // but the final deletion happens only in the idle event
+    // so we need to process the event to really close the progress window
+    wxTheApp->ProcessIdle();
+#endif
     // calculate control point errors and display text.
     if (AskApplyResult(optPano))
     {

[Hugin-cvs] /hgroot/hugin/hugin: Try to remove progress window of optimizer ...

From: <hugin-cvs@li...> - 2012-07-29 10:18

branch:     2012.0
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/b21c646215be
changeset:  5925:b21c646215be
user:       tmodes
date:       Sun Jul 29 12:18:25 2012 +0200
description:

Try to remove progress window of optimizer before showing the results

diffstat:

 src/hugin1/hugin/OptimizePanel.cpp |  6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diffs (16 lines):

diff -r 3f4869373f16 -r b21c646215be src/hugin1/hugin/OptimizePanel.cpp
--- a/src/hugin1/hugin/OptimizePanel.cpp	Wed Jul 25 19:27:57 2012 +0200
+++ b/src/hugin1/hugin/OptimizePanel.cpp	Sun Jul 29 12:18:25 2012 +0200
@@ -721,6 +721,12 @@
 
     setlocale(LC_ALL,oldlocale);
     free(oldlocale);
+#ifdef __WXMSW__
+    // the progress window of the optimizer is marked for deletion
+    // but the final deletion happens only in the idle event
+    // so we need to process the event to really close the progress window
+    wxTheApp->ProcessIdle();
+#endif
     // calculate control point errors and display text.
     if (AskApplyResult(optPano)) {
         GlobalCmdHist::getInstance().addCommand(

[Hugin-cvs] /hgroot/hugin/hugin: Drop encoding for pto_gen.desktop file (And...

From: <hugin-cvs@li...> - 2012-07-28 15:15

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/638a154412a6
changeset:  5923:638a154412a6
user:       harryvanderwolf <hvdwolf@...>
date:       Sat Jul 28 17:15:42 2012 +0200
description:

Drop encoding for pto_gen.desktop file (Andreas Metzler)

diffstat:

 src/tools/pto_gen.desktop |  1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diffs (10 lines):

diff -r 28a967146cc8 -r 638a154412a6 src/tools/pto_gen.desktop
--- a/src/tools/pto_gen.desktop	Sat Jul 28 08:42:38 2012 +0200
+++ b/src/tools/pto_gen.desktop	Sat Jul 28 17:15:42 2012 +0200
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=Hugin PTO generator
 Comment=Initialise a Hugin panorama project from multiple photos
 Exec=pto_gen %F

[Hugin-cvs] /hgroot/hugin/hugin: Updated Italian translation

From: <hugin-cvs@li...> - 2012-07-28 06:43

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/28a967146cc8
changeset:  5922:28a967146cc8
user:       mcri
date:       Sat Jul 28 08:42:38 2012 +0200
description:

Updated Italian translation

diffstat:

 src/translations/it.po |  4935 +++++++++++++++++++++++++++--------------------
 1 files changed, 2848 insertions(+), 2087 deletions(-)

diff (troncati da 8706 linee a 500):

diff -r 7b80840a2e0c -r 28a967146cc8 src/translations/it.po
--- a/src/translations/it.po	Wed Jul 25 19:27:57 2012 +0200
+++ b/src/translations/it.po	Sat Jul 28 08:42:38 2012 +0200
@@ -36,7 +36,7 @@
 "Project-Id-Version: hugin 0.8\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
 "POT-Creation-Date: 2012-07-23 06:47+0200\n"
-"PO-Revision-Date: 2012-04-19 20:31+0100\n"
+"PO-Revision-Date: 2012-07-28 08:41+0100\n"
 "Last-Translator: Cristian Marchi <cri.penta@..."
 "Language-Team: Italian <tp@..."
 "Language: it\n"
@@ -45,72 +45,98 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82
+#: hugin1/base_wx/huginConfig.cpp:47
+#: hugin1/base_wx/huginConfig.cpp:82
 #, c-format
-msgid ""
-"External program %s not found as specified in preferences, reverting to "
-"bundled version"
-msgstr ""
-"Il programma esterno %s non è stato trovato come specificato nelle "
-"preferenze, viene usata la versione nel bundle"
-
-#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:57
-#: hugin1/base_wx/huginConfig.cpp:69 hugin1/base_wx/huginConfig.cpp:82
-#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/RunStitchPanel.cpp:111
-#: hugin1/base_wx/wxLensDB.cpp:749 hugin1/base_wx/wxLensDB.cpp:762
-#: hugin1/base_wx/wxLensDB.cpp:808 hugin1/base_wx/wxLensDB.cpp:815
-#: hugin1/base_wx/wxLensDB.cpp:820 hugin1/base_wx/wxLensDB.cpp:983
+msgid "External program %s not found as specified in preferences, reverting to bundled version"
+msgstr "Il programma esterno %s non è stato trovato come specificato nelle preferenze, viene usata la versione nel bundle"
+
+#: hugin1/base_wx/huginConfig.cpp:47
+#: hugin1/base_wx/huginConfig.cpp:57
+#: hugin1/base_wx/huginConfig.cpp:69
+#: hugin1/base_wx/huginConfig.cpp:82
+#: hugin1/base_wx/platform.cpp:125
+#: hugin1/base_wx/RunStitchPanel.cpp:111
+#: hugin1/base_wx/wxLensDB.cpp:749
+#: hugin1/base_wx/wxLensDB.cpp:762
+#: hugin1/base_wx/wxLensDB.cpp:808
+#: hugin1/base_wx/wxLensDB.cpp:815
+#: hugin1/base_wx/wxLensDB.cpp:820
+#: hugin1/base_wx/wxLensDB.cpp:983
 #: hugin1/calibrate_lens/LensCalFrame.cpp:101
 #: hugin1/calibrate_lens/LensCalFrame.cpp:402
 #: hugin1/calibrate_lens/LensCalFrame.cpp:466
-#: hugin1/hugin/AssistantPanel.cpp:365 hugin1/hugin/AssistantPanel.cpp:433
-#: hugin1/hugin/AssistantPanel.cpp:481 hugin1/hugin/AssistantPanel.cpp:491
-#: hugin1/hugin/AssistantPanel.cpp:503 hugin1/hugin/AssistantPanel.cpp:509
-#: hugin1/hugin/CPEditorPanel.cpp:1783 hugin1/hugin/GLViewer.cpp:153
-#: hugin1/hugin/GLViewer.cpp:163 hugin1/hugin/LensPanel.cpp:843
-#: hugin1/hugin/MainFrame.cpp:185 hugin1/hugin/MainFrame.cpp:746
-#: hugin1/hugin/MainFrame.cpp:1026 hugin1/hugin/MainFrame.cpp:1567
+#: hugin1/hugin/AssistantPanel.cpp:365
+#: hugin1/hugin/AssistantPanel.cpp:433
+#: hugin1/hugin/AssistantPanel.cpp:481
+#: hugin1/hugin/AssistantPanel.cpp:491
+#: hugin1/hugin/AssistantPanel.cpp:503
+#: hugin1/hugin/AssistantPanel.cpp:509
+#: hugin1/hugin/CPEditorPanel.cpp:1783
+#: hugin1/hugin/GLViewer.cpp:153
+#: hugin1/hugin/GLViewer.cpp:163
+#: hugin1/hugin/LensPanel.cpp:843
+#: hugin1/hugin/MainFrame.cpp:185
+#: hugin1/hugin/MainFrame.cpp:746
+#: hugin1/hugin/MainFrame.cpp:1026
+#: hugin1/hugin/MainFrame.cpp:1567
 #: hugin1/hugin/MainFrame.cpp:2064
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:565
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:585
-#: hugin1/hugin/PanoPanel.cpp:997 hugin1/hugin/PanoPanel.cpp:1060
-#: hugin1/hugin/PanoPanel.cpp:1188 hugin1/hugin/PanoPanel.cpp:1206
+#: hugin1/hugin/PanoPanel.cpp:997
+#: hugin1/hugin/PanoPanel.cpp:1060
+#: hugin1/hugin/PanoPanel.cpp:1188
+#: hugin1/hugin/PanoPanel.cpp:1206
 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:246
-#: hugin1/ptbatcher/BatchFrame.cpp:455 hugin1/ptbatcher/FindPanoDialog.cpp:283
+#: hugin1/ptbatcher/BatchFrame.cpp:455
+#: hugin1/ptbatcher/FindPanoDialog.cpp:283
 #: hugin1/ptbatcher/ProjectListBox.cpp:169
 #: hugin1/stitch_project/hugin_stitch_project.cpp:411
 msgid "Error"
 msgstr "Errore"
 
-#: hugin1/base_wx/huginConfig.cpp:57 hugin1/base_wx/huginConfig.cpp:69
-#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/RunStitchPanel.cpp:111
-#: hugin1/hugin/AssistantPanel.cpp:481 hugin1/hugin/PanoPanel.cpp:1206
+#: hugin1/base_wx/huginConfig.cpp:57
+#: hugin1/base_wx/huginConfig.cpp:69
+#: hugin1/base_wx/platform.cpp:125
+#: hugin1/base_wx/RunStitchPanel.cpp:111
+#: hugin1/hugin/AssistantPanel.cpp:481
+#: hugin1/hugin/PanoPanel.cpp:1206
 #, c-format
 msgid "External program %s not found in the bundle, reverting to system path"
-msgstr ""
-"Il programma esterno %s non è stato trovato nel bundle, viene usato il "
-"percorso di sistema"
-
-#: hugin1/base_wx/huginConfig.cpp:95 hugin1/base_wx/huginConfig.cpp:109
+msgstr "Il programma esterno %s non è stato trovato nel bundle, viene usato il percorso di sistema"
+
+#: hugin1/base_wx/huginConfig.cpp:95
+#: hugin1/base_wx/huginConfig.cpp:109
 #, c-format
 msgid "Program %s not found in preferences, reverting to default value"
-msgstr ""
-"Il programma %s non è stato trovato nelle preferenze, viene usato il valore "
-"predefinito"
-
-#: hugin1/base_wx/huginConfig.cpp:129 hugin1/base_wx/huginConfig.cpp:134
-#: hugin1/base_wx/huginConfig.cpp:140 hugin1/base_wx/huginConfig.cpp:145
-#: hugin1/base_wx/huginConfig.cpp:150 hugin1/base_wx/huginConfig.cpp:155
-#: hugin1/base_wx/huginConfig.cpp:161 hugin1/base_wx/huginConfig.cpp:166
-#: hugin1/base_wx/huginConfig.cpp:171 hugin1/base_wx/huginConfig.cpp:176
-#: hugin1/base_wx/huginConfig.cpp:182 hugin1/base_wx/huginConfig.cpp:187
-#: hugin1/base_wx/huginConfig.cpp:194 hugin1/base_wx/huginConfig.cpp:199
-#: hugin1/base_wx/huginConfig.cpp:219 hugin1/base_wx/huginConfig.cpp:224
-#: hugin1/base_wx/huginConfig.cpp:230 hugin1/base_wx/huginConfig.cpp:235
-#: hugin1/base_wx/huginConfig.cpp:240 hugin1/base_wx/huginConfig.cpp:245
-#: hugin1/base_wx/huginConfig.cpp:253 hugin1/base_wx/wxLensDB.cpp:232
-#: hugin1/base_wx/wxLensDB.cpp:607 hugin1/base_wx/wxLensDB.cpp:659
-#: hugin1/base_wx/wxLensDB.cpp:931 hugin1/base_wx/wxLensDB.cpp:936
+msgstr "Il programma %s non è stato trovato nelle preferenze, viene usato il valore predefinito"
+
+#: hugin1/base_wx/huginConfig.cpp:129
+#: hugin1/base_wx/huginConfig.cpp:134
+#: hugin1/base_wx/huginConfig.cpp:140
+#: hugin1/base_wx/huginConfig.cpp:145
+#: hugin1/base_wx/huginConfig.cpp:150
+#: hugin1/base_wx/huginConfig.cpp:155
+#: hugin1/base_wx/huginConfig.cpp:161
+#: hugin1/base_wx/huginConfig.cpp:166
+#: hugin1/base_wx/huginConfig.cpp:171
+#: hugin1/base_wx/huginConfig.cpp:176
+#: hugin1/base_wx/huginConfig.cpp:182
+#: hugin1/base_wx/huginConfig.cpp:187
+#: hugin1/base_wx/huginConfig.cpp:194
+#: hugin1/base_wx/huginConfig.cpp:199
+#: hugin1/base_wx/huginConfig.cpp:219
+#: hugin1/base_wx/huginConfig.cpp:224
+#: hugin1/base_wx/huginConfig.cpp:230
+#: hugin1/base_wx/huginConfig.cpp:235
+#: hugin1/base_wx/huginConfig.cpp:240
+#: hugin1/base_wx/huginConfig.cpp:245
+#: hugin1/base_wx/huginConfig.cpp:253
+#: hugin1/base_wx/wxLensDB.cpp:232
+#: hugin1/base_wx/wxLensDB.cpp:607
+#: hugin1/base_wx/wxLensDB.cpp:659
+#: hugin1/base_wx/wxLensDB.cpp:931
+#: hugin1/base_wx/wxLensDB.cpp:936
 #: hugin1/calibrate_lens/LensCalFrame.cpp:415
 #: hugin1/calibrate_lens/LensCalFrame.cpp:594
 #: hugin1/calibrate_lens/LensCalFrame.cpp:617
@@ -119,62 +145,78 @@
 #: hugin1/calibrate_lens/LensCalFrame.cpp:768
 #: hugin1/calibrate_lens/LensCalFrame.cpp:794
 #: hugin1/calibrate_lens/LensCalFrame.cpp:866
-#: hugin1/hugin/AssistantPanel.cpp:437 hugin1/hugin/CPDetectorDialog.cpp:121
-#: hugin1/hugin/GLPreviewFrame.cpp:1398 hugin1/hugin/GLPreviewFrame.cpp:1405
-#: hugin1/hugin/GLPreviewFrame.cpp:1412 hugin1/hugin/GLPreviewFrame.cpp:1426
-#: hugin1/hugin/GLPreviewFrame.cpp:1433 hugin1/hugin/GLPreviewFrame.cpp:1440
-#: hugin1/hugin/MainFrame.cpp:742 hugin1/hugin/MainFrame.cpp:1790
-#: hugin1/hugin/MaskEditorPanel.cpp:448 hugin1/hugin/PreferencesDialog.cpp:934
+#: hugin1/hugin/AssistantPanel.cpp:437
+#: hugin1/hugin/CPDetectorDialog.cpp:121
+#: hugin1/hugin/GLPreviewFrame.cpp:1398
+#: hugin1/hugin/GLPreviewFrame.cpp:1405
+#: hugin1/hugin/GLPreviewFrame.cpp:1412
+#: hugin1/hugin/GLPreviewFrame.cpp:1426
+#: hugin1/hugin/GLPreviewFrame.cpp:1433
+#: hugin1/hugin/GLPreviewFrame.cpp:1440
+#: hugin1/hugin/MainFrame.cpp:742
+#: hugin1/hugin/MainFrame.cpp:1790
+#: hugin1/hugin/MaskEditorPanel.cpp:448
+#: hugin1/hugin/PreferencesDialog.cpp:934
 #: hugin1/ptbatcher/FindPanoDialog.cpp:240
 #: hugin1/ptbatcher/FindPanoDialog.cpp:261
 msgid "Warning"
 msgstr "Avviso"
 
 # Tipo di obiettivo
-#: hugin1/base_wx/LensTools.cpp:37 hugin1/hugin/ImagesList.cpp:608
+#: hugin1/base_wx/LensTools.cpp:37
+#: hugin1/hugin/ImagesList.cpp:608
 msgid "Normal (rectilinear)"
 msgstr "Normale (rettilineo)"
 
 # Tipo di obiettivo
-#: hugin1/base_wx/LensTools.cpp:38 hugin1/hugin/ImagesList.cpp:609
+#: hugin1/base_wx/LensTools.cpp:38
+#: hugin1/hugin/ImagesList.cpp:609
 msgid "Panoramic (cylindrical)"
 msgstr "Panoramico (cilindrico)"
 
 # Tipo di obiettivo
-#: hugin1/base_wx/LensTools.cpp:39 hugin1/hugin/ImagesList.cpp:610
+#: hugin1/base_wx/LensTools.cpp:39
+#: hugin1/hugin/ImagesList.cpp:610
 msgid "Circular fisheye"
 msgstr "Fisheye circolare"
 
 # Tipo di obiettivo
-#: hugin1/base_wx/LensTools.cpp:40 hugin1/hugin/ImagesList.cpp:611
+#: hugin1/base_wx/LensTools.cpp:40
+#: hugin1/hugin/ImagesList.cpp:611
 msgid "Full frame fisheye"
 msgstr "Fisheye full-frame"
 
-#: hugin1/base_wx/LensTools.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1301
-#: hugin1/hugin/ImagesList.cpp:612 hugin1/hugin/PreviewFrame.cpp:622
+#: hugin1/base_wx/LensTools.cpp:41
+#: hugin1/hugin/GLPreviewFrame.cpp:1301
+#: hugin1/hugin/ImagesList.cpp:612
+#: hugin1/hugin/PreviewFrame.cpp:622
 msgid "Equirectangular"
 msgstr "Equirettangolare"
 
 # Proiezione
-#: hugin1/base_wx/LensTools.cpp:42 hugin1/hugin/ImagesList.cpp:613
+#: hugin1/base_wx/LensTools.cpp:42
+#: hugin1/hugin/ImagesList.cpp:613
 #: hugin1/hugin/PanoPanel.cpp:158
 msgid "Orthographic"
 msgstr "Ortografica"
 
 # Proiezione
-#: hugin1/base_wx/LensTools.cpp:43 hugin1/hugin/ImagesList.cpp:614
+#: hugin1/base_wx/LensTools.cpp:43
+#: hugin1/hugin/ImagesList.cpp:614
 #: hugin1/hugin/PanoPanel.cpp:148
 msgid "Stereographic"
 msgstr "Stereografica"
 
 # Proiezione
-#: hugin1/base_wx/LensTools.cpp:44 hugin1/hugin/ImagesList.cpp:615
+#: hugin1/base_wx/LensTools.cpp:44
+#: hugin1/hugin/ImagesList.cpp:615
 #: hugin1/hugin/PanoPanel.cpp:159
 msgid "Equisolid"
 msgstr "Equisolida"
 
 # Proiezione
-#: hugin1/base_wx/LensTools.cpp:45 hugin1/hugin/ImagesList.cpp:616
+#: hugin1/base_wx/LensTools.cpp:45
+#: hugin1/hugin/ImagesList.cpp:616
 msgid "Fisheye Thoby"
 msgstr "Fisheye di Thoby"
 
@@ -191,8 +233,7 @@
 "Incompatible lens parameter file, image sizes do not match\n"
 "Apply settings anyway?"
 msgstr ""
-"File parametro obiettivo non compatibile, dimensioni immagine non "
-"corrispondenti\n"
+"File parametro obiettivo non compatibile, dimensioni immagine non corrispondenti\n"
 "Applicare le impostazioni?"
 
 #: hugin1/base_wx/LensTools.cpp:242
@@ -216,13 +257,32 @@
 
 #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:606
 #: hugin1/ptbatcher/RunStitchFrame.cpp:43
-#: hugin1/stitch_project/hugin_stitch_project.cpp:126 translations/xrc.cpp:33
-#: translations/xrc.cpp:162 translations/xrc.cpp:300 translations/xrc.cpp:316
-#: translations/xrc.cpp:323 translations/xrc.cpp:534 translations/xrc.cpp:604
-#: translations/xrc.cpp:608 translations/xrc.cpp:612 translations/xrc.cpp:706
-#: translations/xrc.cpp:853 translations/xrc.cpp:891 translations/xrc.cpp:1054
-#: xrc.cpp:33 xrc.cpp:162 xrc.cpp:300 xrc.cpp:316 xrc.cpp:323 xrc.cpp:534
-#: xrc.cpp:604 xrc.cpp:608 xrc.cpp:612 xrc.cpp:706 xrc.cpp:853 xrc.cpp:891
+#: hugin1/stitch_project/hugin_stitch_project.cpp:126
+#: translations/xrc.cpp:33
+#: translations/xrc.cpp:162
+#: translations/xrc.cpp:300
+#: translations/xrc.cpp:316
+#: translations/xrc.cpp:323
+#: translations/xrc.cpp:534
+#: translations/xrc.cpp:604
+#: translations/xrc.cpp:608
+#: translations/xrc.cpp:612
+#: translations/xrc.cpp:706
+#: translations/xrc.cpp:853
+#: translations/xrc.cpp:891
+#: translations/xrc.cpp:1054
+#: xrc.cpp:33
+#: xrc.cpp:162
+#: xrc.cpp:300
+#: xrc.cpp:316
+#: xrc.cpp:323
+#: xrc.cpp:534
+#: xrc.cpp:604
+#: xrc.cpp:608
+#: xrc.cpp:612
+#: xrc.cpp:706
+#: xrc.cpp:853
+#: xrc.cpp:891
 #: xrc.cpp:1054
 msgid "Cancel"
 msgstr "Annulla"
@@ -240,41 +300,40 @@
 msgstr "Ottimizzazione del panorama in corso..."
 
 #: hugin1/base_wx/platform.h:40
-msgid ""
-"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*."
-"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|"
-"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*."
-"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*."
-"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*"
-msgstr ""
-"Tutti i file immagine|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*."
-"png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;"
-"*.EXR|File JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|File TIFF (*.tif,*."
-"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|File PNG (*.png)|*.png;*.PNG|File HDR (*."
-"hdr)|*.hdr;*.HDR|File EXR (*.exr)|*.exr;*.EXR|Tutti i file (*)|*"
-
-#: hugin1/base_wx/PTWXDlg.cpp:49 hugin1/base_wx/PTWXDlg.cpp:68
-#: hugin1/base_wx/PTWXDlg.cpp:122 translations/xrc.cpp:854 xrc.cpp:854
+msgid "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*"
+msgstr "Tutti i file immagine|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|File JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|File TIFF (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|File PNG (*.png)|*.png;*.PNG|File HDR (*.hdr)|*.hdr;*.HDR|File EXR (*.exr)|*.exr;*.EXR|Tutti i file (*)|*"
+
+#: hugin1/base_wx/PTWXDlg.cpp:49
+#: hugin1/base_wx/PTWXDlg.cpp:68
+#: hugin1/base_wx/PTWXDlg.cpp:122
+#: translations/xrc.cpp:854
+#: xrc.cpp:854
 msgid "Panorama Tools"
 msgstr "Panorama Tools"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:135 hugin1/base_wx/RunStitchPanel.cpp:304
+#: hugin1/base_wx/RunStitchPanel.cpp:135
+#: hugin1/base_wx/RunStitchPanel.cpp:304
 msgid "Could not open project file:"
 msgstr "Impossibile aprire il file progetto:"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:145 hugin1/base_wx/RunStitchPanel.cpp:312
-#: hugin1/nona_gui/nona_gui.cpp:243 hugin1/ptbatcher/ProjectArray.cpp:88
+#: hugin1/base_wx/RunStitchPanel.cpp:145
+#: hugin1/base_wx/RunStitchPanel.cpp:312
+#: hugin1/nona_gui/nona_gui.cpp:243
+#: hugin1/ptbatcher/ProjectArray.cpp:88
 #, c-format
 msgid "could not open script : %s"
 msgstr "Impossibile aprire lo script: %s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:166 hugin1/base_wx/RunStitchPanel.cpp:320
-#: hugin1/nona_gui/nona_gui.cpp:250 hugin1/ptbatcher/ProjectArray.cpp:115
+#: hugin1/base_wx/RunStitchPanel.cpp:166
+#: hugin1/base_wx/RunStitchPanel.cpp:320
+#: hugin1/nona_gui/nona_gui.cpp:250
+#: hugin1/ptbatcher/ProjectArray.cpp:115
 #, c-format
 msgid "error while parsing panotools script: %s"
 msgstr "Errore nell'analizzare lo script di panotools: %s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:227
+#: hugin1/base_wx/RunStitchPanel.cpp:210
+#: hugin1/base_wx/RunStitchPanel.cpp:227
 #: hugin1/base_wx/RunStitchPanel.cpp:346
 msgid "Could not create temporary file"
 msgstr "Impossibile creare il file temporaneo"
@@ -305,7 +364,8 @@
 "Errore nell'assemblare il progetto\n"
 "%s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:287 hugin1/base_wx/RunStitchPanel.cpp:293
+#: hugin1/base_wx/RunStitchPanel.cpp:287
+#: hugin1/base_wx/RunStitchPanel.cpp:293
 #: hugin1/stitch_project/hugin_stitch_project.cpp:177
 msgid "Error during stitching"
 msgstr "Errore durante l'assemblaggio"
@@ -319,7 +379,8 @@
 "Errore nell'eseguire l'assistente\n"
 "%s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:366 hugin1/base_wx/RunStitchPanel.cpp:374
+#: hugin1/base_wx/RunStitchPanel.cpp:366
+#: hugin1/base_wx/RunStitchPanel.cpp:374
 msgid "Error during running assistant"
 msgstr "Errore durante l'esecuzione dell'assistente"
 
@@ -338,25 +399,19 @@
 msgstr "Nessun obiettivo trovato."
 
 #: hugin1/base_wx/wxLensDB.cpp:607
-msgid ""
-"There are too less information for saving data into database. Please check "
-"your input!"
-msgstr ""
-"Mancano alcune informazioni per salvare i dati nel database. Controllare "
-"l'input."
+msgid "There are too less information for saving data into database. Please check your input!"
+msgstr "Mancano alcune informazioni per salvare i dati nel database. Controllare l'input."
 
 #: hugin1/base_wx/wxLensDB.cpp:658
 #, c-format
 msgid ""
 "You selected the folder \"%s\" to save your database file.\n"
-"This is not the default folder. You won't be able to automatically load "
-"these informations back into Hugin.\n"
+"This is not the default folder. You won't be able to automatically load these informations back into Hugin.\n"
 "The default folder for the database files is \"%s\".\n"
 "Do you want to proceed anyway?"
 msgstr ""
 "È stata selezionata la cartella «%s» per salvare il file del database.\n"
-"Questa non è la cartella predefinita. Non sarà possibile caricare queste "
-"informazioni automaticamente all'interno di Hugin.\n"
+"Questa non è la cartella predefinita. Non sarà possibile caricare queste informazioni automaticamente all'interno di Hugin.\n"
 "La cartella predefinita per il file del database è «%s».\n"
 "Continuare?"
 
@@ -364,12 +419,15 @@
 msgid "Save lens into database file"
 msgstr "Salva obiettivo nel file del database"
 
-#: hugin1/base_wx/wxLensDB.cpp:708 hugin1/base_wx/wxLensDB.cpp:962
+#: hugin1/base_wx/wxLensDB.cpp:708
+#: hugin1/base_wx/wxLensDB.cpp:962
 msgid "Lensfun database files (*.xml)|*.xml"
 msgstr "File database di lensfun (*.xml)|*.xml"
 
-#: hugin1/base_wx/wxLensDB.cpp:749 hugin1/base_wx/wxLensDB.cpp:762
-#: hugin1/base_wx/wxLensDB.cpp:808 hugin1/base_wx/wxLensDB.cpp:983
+#: hugin1/base_wx/wxLensDB.cpp:749
+#: hugin1/base_wx/wxLensDB.cpp:762
+#: hugin1/base_wx/wxLensDB.cpp:808
+#: hugin1/base_wx/wxLensDB.cpp:983
 msgid "Could not save information into database file."
 msgstr "Impossibile salvare le informazioni nel file del database."
 
@@ -380,13 +438,11 @@
 #: hugin1/base_wx/wxLensDB.cpp:819
 #, c-format
 msgid ""
-"The current selected lens does not match with the information of this lens "
-"in the selected database file.\n"
+"The current selected lens does not match with the information of this lens in the selected database file.\n"
 "Could not proceed.\n"
 "(Error code: %d)"
 msgstr ""
-"L'obiettivo selezionato non corrisponde alle informazioni di questo "
-"obiettivo nel file del database selezionato.\n"
+"L'obiettivo selezionato non corrisponde alle informazioni di questo obiettivo nel file del database selezionato.\n"
 "Impossibile continuare.\n"
 "(Codice errore: %d)"
 
@@ -403,7 +459,8 @@
 msgid "Save camera into database file"
 msgstr "Salva fotocamera nel file del database"
 
-#: hugin1/calibrate_lens/LensCalApp.cpp:66 hugin1/hugin/huginApp.cpp:193
+#: hugin1/calibrate_lens/LensCalApp.cpp:66
+#: hugin1/hugin/huginApp.cpp:193
 #: hugin1/ptbatcher/PTBatcherGUI.cpp:80
 msgid "xrc directory not found in bundle"
 msgstr "Cartella xrc non trovata nel bundle"
@@ -411,28 +468,35 @@
 #: hugin1/calibrate_lens/LensCalApp.cpp:66
 #: hugin1/calibrate_lens/LensCalApp.cpp:74
 #: hugin1/calibrate_lens/LensCalApp.cpp:80
-#: hugin1/calibrate_lens/LensCalApp.cpp:92 hugin1/hugin/huginApp.cpp:193
-#: hugin1/hugin/huginApp.cpp:205 hugin1/hugin/huginApp.cpp:214
-#: hugin1/hugin/huginApp.cpp:228 hugin1/hugin/MainFrame.cpp:2059
-#: hugin1/ptbatcher/PTBatcherGUI.cpp:80 hugin1/ptbatcher/PTBatcherGUI.cpp:91
-#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119
+#: hugin1/calibrate_lens/LensCalApp.cpp:92
+#: hugin1/hugin/huginApp.cpp:193
+#: hugin1/hugin/huginApp.cpp:205
+#: hugin1/hugin/huginApp.cpp:214
+#: hugin1/hugin/huginApp.cpp:228
+#: hugin1/hugin/MainFrame.cpp:2059
+#: 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
 msgid "Fatal Error"
 msgstr "Errore fatale"
 
-#: hugin1/calibrate_lens/LensCalApp.cpp:74 hugin1/hugin/huginApp.cpp:205
+#: hugin1/calibrate_lens/LensCalApp.cpp:74
+#: hugin1/hugin/huginApp.cpp:205
 #: hugin1/ptbatcher/PTBatcherGUI.cpp:91
 #: hugin1/stitch_project/hugin_stitch_project.cpp:306
 msgid "Translations not found in bundle"
 msgstr "Traduzioni non trovate nel bundle"
 
-#: hugin1/calibrate_lens/LensCalApp.cpp:79 hugin1/hugin/huginApp.cpp:213
+#: hugin1/calibrate_lens/LensCalApp.cpp:79
+#: hugin1/hugin/huginApp.cpp:213
 #: hugin1/ptbatcher/PTBatcherGUI.cpp:96
-#, fuzzy
 msgid "lensfun directory not found in bundle"
-msgstr "Cartella xrc non trovata nel bundle"

[Hugin-cvs] /hgroot/hugin/hugin: Updated year and added reference to lensfun...

From: <hugin-cvs@li...> - 2012-07-25 17:28

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/7b80840a2e0c
changeset:  5921:7b80840a2e0c
user:       tmodes
date:       Wed Jul 25 19:27:57 2012 +0200
description:

Updated year and added reference to lensfun lib

diffstat:

 src/hugin1/hugin/xrc/data/intro.htm    |  2 +-
 src/hugin1/hugin/xrc/data/upstream.txt |  1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 11ab9286a061 -r 7b80840a2e0c src/hugin1/hugin/xrc/data/intro.htm
--- a/src/hugin1/hugin/xrc/data/intro.htm	Wed Jul 25 18:54:18 2012 +0200
+++ b/src/hugin1/hugin/xrc/data/intro.htm	Wed Jul 25 19:27:57 2012 +0200
@@ -1,6 +1,6 @@
 <p>Hugin was originally developed by Pablo d'Angelo.
 <br/>
-&copy; 2004-2011
+&copy; 2004-2012
 </p><p>
 By setting his original software Free under the GPL, Pablo started
 what has become a thriving community and a project larger than any
diff -r 11ab9286a061 -r 7b80840a2e0c src/hugin1/hugin/xrc/data/upstream.txt
--- a/src/hugin1/hugin/xrc/data/upstream.txt	Wed Jul 25 18:54:18 2012 +0200
+++ b/src/hugin1/hugin/xrc/data/upstream.txt	Wed Jul 25 19:27:57 2012 +0200
@@ -7,6 +7,7 @@
 levmar by Manolis Lourakis http://www.ics.forth.gr/~lourakis/levmar
 FLANN by Marius Muja and David G. Lowe, http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN (used unmodified)
 ANN: by David M. Mount and Sunil Arya http://www.cs.umd.edu/~mount/ANN/
+lensfun by Andrew Zabolotny http://lensfun.berlios.de/
 
 The camera response estimation uses the EMoR response model developed 
 at the Computer Vision Laboratory of the Columbia University.

[Hugin-cvs] /hgroot/hugin/hugin: Updated year and added reference to lensfun...

From: <hugin-cvs@li...> - 2012-07-25 17:28

branch:     2012.0
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/3f4869373f16
changeset:  5920:3f4869373f16
user:       tmodes
date:       Wed Jul 25 19:27:57 2012 +0200
description:

Updated year and added reference to lensfun lib

diffstat:

 src/hugin1/hugin/xrc/data/intro.htm    |  2 +-
 src/hugin1/hugin/xrc/data/upstream.txt |  1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 80387ba9b538 -r 3f4869373f16 src/hugin1/hugin/xrc/data/intro.htm
--- a/src/hugin1/hugin/xrc/data/intro.htm	Wed Jul 25 18:23:37 2012 +0200
+++ b/src/hugin1/hugin/xrc/data/intro.htm	Wed Jul 25 19:27:57 2012 +0200
@@ -1,6 +1,6 @@
 <p>Hugin was originally developed by Pablo d'Angelo.
 <br/>
-&copy; 2004-2011
+&copy; 2004-2012
 </p><p>
 By setting his original software Free under the GPL, Pablo started
 what has become a thriving community and a project larger than any
diff -r 80387ba9b538 -r 3f4869373f16 src/hugin1/hugin/xrc/data/upstream.txt
--- a/src/hugin1/hugin/xrc/data/upstream.txt	Wed Jul 25 18:23:37 2012 +0200
+++ b/src/hugin1/hugin/xrc/data/upstream.txt	Wed Jul 25 19:27:57 2012 +0200
@@ -7,6 +7,7 @@
 levmar by Manolis Lourakis http://www.ics.forth.gr/~lourakis/levmar
 FLANN by Marius Muja and David G. Lowe, http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN (used unmodified)
 ANN: by David M. Mount and Sunil Arya http://www.cs.umd.edu/~mount/ANN/
+lensfun by Andrew Zabolotny http://lensfun.berlios.de/
 
 The camera response estimation uses the EMoR response model developed 
 at the Computer Vision Laboratory of the Columbia University.

[Hugin-cvs] /hgroot/hugin/hugin: Unified api-max usage in scripts

From: <hugin-cvs@li...> - 2012-07-25 17:17

branch:     2012.0
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/2f57a697dc36
changeset:  5918:2f57a697dc36
user:       tmodes
date:       Wed Jul 25 18:21:30 2012 +0200
description:

Unified api-max usage in scripts
Assuming no change to api and preferences when releasing a x.x.1 version

diffstat:

 src/hugin1/hugin/PluginItems.cpp                          |  3 ---
 src/hugin_script_interface/plugins-dev/dual_use.py        |  4 ++--
 src/hugin_script_interface/plugins-dev/plugin_skeleton.py |  4 ++--
 src/hugin_script_interface/plugins/shooting_pattern.py    |  4 ++--
 src/hugin_version.h.in.cmake                              |  2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)

diffs (74 lines):

diff -r 0b850e3b1d4e -r 2f57a697dc36 src/hugin1/hugin/PluginItems.cpp
--- a/src/hugin1/hugin/PluginItems.cpp	Tue Jul 24 19:53:45 2012 +0200
+++ b/src/hugin1/hugin/PluginItems.cpp	Wed Jul 25 18:21:30 2012 +0200
@@ -138,8 +138,6 @@
             };
             continue;
         };
-// test max API only for release versions
-#if ((VERSION_MINOR%2)==0)
         pos=lowerLine.Find(tagAPImax);
         if(pos!=wxNOT_FOUND)
         {
@@ -152,7 +150,6 @@
             };
             continue;
         };
-#endif
         pos=lowerLine.Find(tagCategory);
         if(pos!=wxNOT_FOUND)
         {
diff -r 0b850e3b1d4e -r 2f57a697dc36 src/hugin_script_interface/plugins-dev/dual_use.py
--- a/src/hugin_script_interface/plugins-dev/dual_use.py	Tue Jul 24 19:53:45 2012 +0200
+++ b/src/hugin_script_interface/plugins-dev/dual_use.py	Wed Jul 25 18:21:30 2012 +0200
@@ -23,8 +23,8 @@
 
 # @category Examples
 # @name     Dual Use Plugin
-# @api-min  2011.1.0
-# @api-max  2012.0.0
+# @api-min  2011.1
+# @api-max  2012.0
 
 # dual_use will function as a hugin plugin and as a standalone
 # Python script.
diff -r 0b850e3b1d4e -r 2f57a697dc36 src/hugin_script_interface/plugins-dev/plugin_skeleton.py
--- a/src/hugin_script_interface/plugins-dev/plugin_skeleton.py	Tue Jul 24 19:53:45 2012 +0200
+++ b/src/hugin_script_interface/plugins-dev/plugin_skeleton.py	Wed Jul 25 18:21:30 2012 +0200
@@ -18,8 +18,8 @@
 
 # @category Examples
 # @name     Skeleton Plugin
-# @api-min  2011.1.0
-# @api-max  2012.0.0
+# @api-min  2011.1
+# @api-max  2012.0
 
 # we use modern type python print statements:
 
diff -r 0b850e3b1d4e -r 2f57a697dc36 src/hugin_script_interface/plugins/shooting_pattern.py
--- a/src/hugin_script_interface/plugins/shooting_pattern.py	Tue Jul 24 19:53:45 2012 +0200
+++ b/src/hugin_script_interface/plugins/shooting_pattern.py	Wed Jul 25 18:21:30 2012 +0200
@@ -41,8 +41,8 @@
 # @name     6-1-1 Shooting Pattern
 # @description apply a shooting pattern (6 around, 1 up 1 down)
 # @sys win nix mac
-# @api-max 2012.0.0
-# @api-min 2011.1.0
+# @api-max 2012.0
+# @api-min 2011.1
 
 # the position routine will apply yaw, pitch to an image
 
diff -r 0b850e3b1d4e -r 2f57a697dc36 src/hugin_version.h.in.cmake
--- a/src/hugin_version.h.in.cmake	Tue Jul 24 19:53:45 2012 +0200
+++ b/src/hugin_version.h.in.cmake	Wed Jul 25 18:21:30 2012 +0200
@@ -4,7 +4,7 @@
 #define VERSION_MINOR ${V_MINOR}
 #define VERSION_PATCH ${V_PATCH}
 #define HUGIN_WC_REVISION ${HUGIN_WC_REVISION}
-#define HUGIN_API_VERSION "${V_MAJOR}.${V_MINOR}.${V_PATCH}"
+#define HUGIN_API_VERSION "${V_MAJOR}.${V_MINOR}"
 
 #if defined (_MSC_VER) || (__APPLE__)
 #define PACKAGE_VERSION "${HUGIN_PACKAGE_VERSION} built by ${HUGIN_BUILDER}"

[Hugin-cvs] /hgroot/hugin/hugin: Unified api-max usage in scripts

From: <hugin-cvs@li...> - 2012-07-25 17:27

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/db84377988ac
changeset:  5914:db84377988ac
user:       tmodes
date:       Wed Jul 25 18:21:30 2012 +0200
description:

Unified api-max usage in scripts
Assuming no change to api and preferences when releasing a x.x.1 version

diffstat:

 src/hugin1/hugin/PluginItems.cpp                          |  3 ---
 src/hugin_script_interface/plugins-dev/dual_use.py        |  4 ++--
 src/hugin_script_interface/plugins-dev/plugin_skeleton.py |  4 ++--
 src/hugin_script_interface/plugins/shooting_pattern.py    |  4 ++--
 src/hugin_version.h.in.cmake                              |  2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)

diffs (74 lines):

diff -r 377ba08a46ba -r db84377988ac src/hugin1/hugin/PluginItems.cpp
--- a/src/hugin1/hugin/PluginItems.cpp	Tue Jul 24 19:55:18 2012 +0200
+++ b/src/hugin1/hugin/PluginItems.cpp	Wed Jul 25 18:21:30 2012 +0200
@@ -138,8 +138,6 @@
             };
             continue;
         };
-// test max API only for release versions
-#if ((VERSION_MINOR%2)==0)
         pos=lowerLine.Find(tagAPImax);
         if(pos!=wxNOT_FOUND)
         {
@@ -152,7 +150,6 @@
             };
             continue;
         };
-#endif
         pos=lowerLine.Find(tagCategory);
         if(pos!=wxNOT_FOUND)
         {
diff -r 377ba08a46ba -r db84377988ac src/hugin_script_interface/plugins-dev/dual_use.py
--- a/src/hugin_script_interface/plugins-dev/dual_use.py	Tue Jul 24 19:55:18 2012 +0200
+++ b/src/hugin_script_interface/plugins-dev/dual_use.py	Wed Jul 25 18:21:30 2012 +0200
@@ -23,8 +23,8 @@
 
 # @category Examples
 # @name     Dual Use Plugin
-# @api-min  2011.1.0
-# @api-max  2012.0.0
+# @api-min  2011.1
+# @api-max  2012.0
 
 # dual_use will function as a hugin plugin and as a standalone
 # Python script.
diff -r 377ba08a46ba -r db84377988ac src/hugin_script_interface/plugins-dev/plugin_skeleton.py
--- a/src/hugin_script_interface/plugins-dev/plugin_skeleton.py	Tue Jul 24 19:55:18 2012 +0200
+++ b/src/hugin_script_interface/plugins-dev/plugin_skeleton.py	Wed Jul 25 18:21:30 2012 +0200
@@ -18,8 +18,8 @@
 
 # @category Examples
 # @name     Skeleton Plugin
-# @api-min  2011.1.0
-# @api-max  2012.0.0
+# @api-min  2011.1
+# @api-max  2012.0
 
 # we use modern type python print statements:
 
diff -r 377ba08a46ba -r db84377988ac src/hugin_script_interface/plugins/shooting_pattern.py
--- a/src/hugin_script_interface/plugins/shooting_pattern.py	Tue Jul 24 19:55:18 2012 +0200
+++ b/src/hugin_script_interface/plugins/shooting_pattern.py	Wed Jul 25 18:21:30 2012 +0200
@@ -41,8 +41,8 @@
 # @name     6-1-1 Shooting Pattern
 # @description apply a shooting pattern (6 around, 1 up 1 down)
 # @sys win nix mac
-# @api-max 2012.0.0
-# @api-min 2011.1.0
+# @api-max 2012.0
+# @api-min 2011.1
 
 # the position routine will apply yaw, pitch to an image
 
diff -r 377ba08a46ba -r db84377988ac src/hugin_version.h.in.cmake
--- a/src/hugin_version.h.in.cmake	Tue Jul 24 19:55:18 2012 +0200
+++ b/src/hugin_version.h.in.cmake	Wed Jul 25 18:21:30 2012 +0200
@@ -4,7 +4,7 @@
 #define VERSION_MINOR ${V_MINOR}
 #define VERSION_PATCH ${V_PATCH}
 #define HUGIN_WC_REVISION ${HUGIN_WC_REVISION}
-#define HUGIN_API_VERSION "${V_MAJOR}.${V_MINOR}.${V_PATCH}"
+#define HUGIN_API_VERSION "${V_MAJOR}.${V_MINOR}"
 
 #if defined (_MSC_VER) || (__APPLE__)
 #define PACKAGE_VERSION "${HUGIN_PACKAGE_VERSION} built by ${HUGIN_BUILDER}"

[Hugin-cvs] /hgroot/hugin/hugin: Updated api-max in default branch

From: <hugin-cvs@li...> - 2012-07-25 17:27

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/20df20aa289f
changeset:  5915:20df20aa289f
user:       tmodes
date:       Wed Jul 25 18:22:20 2012 +0200
description:

Updated api-max in default branch

diffstat:

 src/hugin_script_interface/plugins/crop_cp.py          |  2 +-
 src/hugin_script_interface/plugins/shooting_pattern.py |  2 +-
 src/hugin_script_interface/plugins/top_five.py         |  2 +-
 src/hugin_script_interface/plugins/woa.py              |  2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r db84377988ac -r 20df20aa289f src/hugin_script_interface/plugins/crop_cp.py
--- a/src/hugin_script_interface/plugins/crop_cp.py	Wed Jul 25 18:21:30 2012 +0200
+++ b/src/hugin_script_interface/plugins/crop_cp.py	Wed Jul 25 18:22:20 2012 +0200
@@ -24,7 +24,7 @@
 # @category Control Points
 # @name     Crop Control Points
 # @api-min  2011.1
-# @api-max  2012.0
+# @api-max  2012.2
 
 # crop_cps will function as a hugin plugin and as a standalone
 # Python script. It can also serve as a template for a slightly
diff -r db84377988ac -r 20df20aa289f src/hugin_script_interface/plugins/shooting_pattern.py
--- a/src/hugin_script_interface/plugins/shooting_pattern.py	Wed Jul 25 18:21:30 2012 +0200
+++ b/src/hugin_script_interface/plugins/shooting_pattern.py	Wed Jul 25 18:22:20 2012 +0200
@@ -41,7 +41,7 @@
 # @name     6-1-1 Shooting Pattern
 # @description apply a shooting pattern (6 around, 1 up 1 down)
 # @sys win nix mac
-# @api-max 2012.0
+# @api-max 2012.2
 # @api-min 2011.1
 
 # the position routine will apply yaw, pitch to an image
diff -r db84377988ac -r 20df20aa289f src/hugin_script_interface/plugins/top_five.py
--- a/src/hugin_script_interface/plugins/top_five.py	Wed Jul 25 18:21:30 2012 +0200
+++ b/src/hugin_script_interface/plugins/top_five.py	Wed Jul 25 18:22:20 2012 +0200
@@ -5,7 +5,7 @@
 # @category Control Points
 # @name     keep 5 CPs per image pair
 # @api-min  2011.1
-# @api-max  2012.0
+# @api-max  2012.2
 
 #    top_five.py - keep the five best CPs for each image pair
 
diff -r db84377988ac -r 20df20aa289f src/hugin_script_interface/plugins/woa.py
--- a/src/hugin_script_interface/plugins/woa.py	Wed Jul 25 18:21:30 2012 +0200
+++ b/src/hugin_script_interface/plugins/woa.py	Wed Jul 25 18:22:20 2012 +0200
@@ -25,7 +25,7 @@
 # @category Control Points
 # @name     Warped Overlap Analysis
 # @api-min  2011.1
-# @api-max  2012.0
+# @api-max  2012.2
 
 # note that if you want to read the script, it's written bottom-up, so the
 # higher-level routines are towards the end.

[Hugin-cvs] /hgroot/hugin/hugin: Fixes assistant makefile if downscale facto...

From: <hugin-cvs@li...> - 2012-07-25 17:17

branch:     2012.0
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/80387ba9b538
changeset:  5919:80387ba9b538
user:       tmodes
date:       Wed Jul 25 18:23:37 2012 +0200
description:

Fixes assistant makefile if downscale factor for final pano is 1

diffstat:

 src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 2f57a697dc36 -r 80387ba9b538 src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp
--- a/src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp	Wed Jul 25 18:21:30 2012 +0200
+++ b/src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp	Wed Jul 25 18:23:37 2012 +0200
@@ -164,7 +164,7 @@
     // if necessary scale down final pano
     echoInfo(*all,"Setting output options...");
     valuestream.str("");
-    if(scale<1)
+    if(scale<=1.0)
     {
         valuestream << " --canvas=" << hugin_utils::roundi(scale*100) << "%%";
     };

[Hugin-cvs] /hgroot/hugin/hugin: Fixes assistant makefile if downscale facto...

From: <hugin-cvs@li...> - 2012-07-25 17:27

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/0054c9609684
changeset:  5916:0054c9609684
user:       tmodes
date:       Wed Jul 25 18:23:37 2012 +0200
description:

Fixes assistant makefile if downscale factor for final pano is 1

diffstat:

 src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 20df20aa289f -r 0054c9609684 src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp
--- a/src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp	Wed Jul 25 18:22:20 2012 +0200
+++ b/src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp	Wed Jul 25 18:23:37 2012 +0200
@@ -164,7 +164,7 @@
     // if necessary scale down final pano
     echoInfo(*all,"Setting output options...");
     valuestream.str("");
-    if(scale<1)
+    if(scale<=1.0)
     {
         valuestream << " --canvas=" << hugin_utils::roundi(scale*100) << "%%";
     };

[Hugin-cvs] /hgroot/hugin/hugin: Merged with gui_overhaul branch

From: <hugin-cvs@li...> - 2012-07-25 17:17

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/11ab9286a061
changeset:  5917:11ab9286a061
user:       tmodes
date:       Wed Jul 25 18:54:18 2012 +0200
description:

Merged with gui_overhaul branch

diffstat:

 CMakeLists.txt                                                            |    33 +-
 CMakeModules/FindExiv2.cmake                                              |    13 +-
 CMakeModules/win_bundle.cmake                                             |    26 +-
 mac/BuildConfig.xcconfig.orig                                             |     5 +-
 mac/ExternalPrograms/scripts/wxmac29.sh                                   |   270 +
 mac/Hugin.xcodeproj/project.pbxproj                                       |  1865 +++-
 mac/complete-bundle.sh                                                    |     4 +-
 src/foreign/CMakeLists.txt                                                |     3 -
 src/foreign/flann/CMakeLists.txt                                          |    15 +-
 src/foreign/flann/algorithms/all_indices.h                                |   135 +-
 src/foreign/flann/algorithms/autotuned_index.h                            |   377 +-
 src/foreign/flann/algorithms/composite_index.h                            |   187 +-
 src/foreign/flann/algorithms/dist.h                                       |   330 +-
 src/foreign/flann/algorithms/hierarchical_clustering_index.h              |   400 +-
 src/foreign/flann/algorithms/kdtree_index.h                               |   370 +-
 src/foreign/flann/algorithms/kdtree_single_index.h                        |   387 +-
 src/foreign/flann/algorithms/kmeans_index.h                               |  1091 +-
 src/foreign/flann/algorithms/linear_index.h                               |    67 +-
 src/foreign/flann/algorithms/lsh_index.h                                  |   451 +
 src/foreign/flann/algorithms/nn_index.h                                   |   372 +-
 src/foreign/flann/defines.h                                               |   178 +
 src/foreign/flann/flann.cpp                                               |   117 +-
 src/foreign/flann/flann.h                                                 |    56 +-
 src/foreign/flann/flann.hpp                                               |   390 +-
 src/foreign/flann/flann_cpp.cpp                                           |    36 +-
 src/foreign/flann/flann_mpi.hpp                                           |   276 -
 src/foreign/flann/general.h                                               |   256 +-
 src/foreign/flann/io/hdf5.h                                               |    45 +-
 src/foreign/flann/nn/ground_truth.h                                       |     8 +-
 src/foreign/flann/nn/index_testing.cpp                                    |    59 -
 src/foreign/flann/nn/index_testing.h                                      |    69 +-
 src/foreign/flann/nn/simplex_downhill.h                                   |    16 +-
 src/foreign/flann/util/allocator.h                                        |    10 +-
 src/foreign/flann/util/any.h                                              |   292 +
 src/foreign/flann/util/dynamic_bitset.h                                   |   156 +
 src/foreign/flann/util/heap.h                                             |    96 +-
 src/foreign/flann/util/logger.cpp                                         |    84 -
 src/foreign/flann/util/logger.h                                           |    82 +-
 src/foreign/flann/util/lsh_table.h                                        |   477 +
 src/foreign/flann/util/matrix.h                                           |   112 +-
 src/foreign/flann/util/object_factory.h                                   |    44 +-
 src/foreign/flann/util/pair_iterator.hpp                                  |   138 -
 src/foreign/flann/util/params.h                                           |   130 +
 src/foreign/flann/util/random.cpp                                         |    53 -
 src/foreign/flann/util/random.h                                           |    87 +-
 src/foreign/flann/util/result_set.h                                       |   875 +-
 src/foreign/flann/util/sampling.h                                         |    32 +-
 src/foreign/flann/util/saving.cpp                                         |    63 -
 src/foreign/flann/util/saving.h                                           |    93 +-
 src/foreign/flann/util/timer.h                                            |     6 +-
 src/hugin1/PT/PanoCommand.h                                               |   203 +-
 src/hugin1/PT/Panorama.h                                                  |     2 +-
 src/hugin1/base_wx/LensTools.cpp                                          |   410 +-
 src/hugin1/base_wx/LensTools.h                                            |     2 +
 src/hugin1/base_wx/platform.cpp                                           |    48 +-
 src/hugin1/base_wx/platform.h                                             |    11 +-
 src/hugin1/hugin/AssistantPanel.cpp                                       |   680 -
 src/hugin1/hugin/AssistantPanel.h                                         |   117 -
 src/hugin1/hugin/CMakeLists.txt                                           |    24 +-
 src/hugin1/hugin/CropPanel.cpp                                            |   921 -
 src/hugin1/hugin/CropPanel.h                                              |   211 -
 src/hugin1/hugin/GLPreviewFrame.cpp                                       |   738 +-
 src/hugin1/hugin/GLPreviewFrame.h                                         |    41 +-
 src/hugin1/hugin/GLViewer.cpp                                             |   158 +-
 src/hugin1/hugin/GLViewer.h                                               |    19 +-
 src/hugin1/hugin/GuiLevel.cpp                                             |    65 +
 src/hugin1/hugin/GuiLevel.h                                               |    41 +
 src/hugin1/hugin/HFOVDialog.cpp                                           |     1 -
 src/hugin1/hugin/ImageVariableDialog.cpp                                  |   222 +
 src/hugin1/hugin/ImageVariableDialog.h                                    |    58 +
 src/hugin1/hugin/ImagesList.cpp                                           |   423 +-
 src/hugin1/hugin/ImagesList.h                                             |   115 +-
 src/hugin1/hugin/ImagesPanel.cpp                                          |  1380 +-
 src/hugin1/hugin/ImagesPanel.h                                            |   174 +-
 src/hugin1/hugin/ImagesTree.cpp                                           |  1716 +++
 src/hugin1/hugin/ImagesTree.h                                             |   209 +
 src/hugin1/hugin/LensPanel.cpp                                            |  1087 --
 src/hugin1/hugin/LensPanel.h                                              |   173 -
 src/hugin1/hugin/MainFrame.cpp                                            |   834 +-
 src/hugin1/hugin/MainFrame.h                                              |    39 +-
 src/hugin1/hugin/MaskEditorPanel.cpp                                      |   352 +-
 src/hugin1/hugin/MaskEditorPanel.h                                        |    50 +-
 src/hugin1/hugin/MaskImageCtrl.cpp                                        |   602 +-
 src/hugin1/hugin/MaskImageCtrl.h                                          |    79 +-
 src/hugin1/hugin/OptimizePanel.cpp                                        |  1010 +-
 src/hugin1/hugin/OptimizePanel.h                                          |    51 +-
 src/hugin1/hugin/OptimizePhotometricPanel.cpp                             |   664 +-
 src/hugin1/hugin/OptimizePhotometricPanel.h                               |    53 +-
 src/hugin1/hugin/PanoOperation.cpp                                        |  1202 ++
 src/hugin1/hugin/PanoOperation.h                                          |   272 +
 src/hugin1/hugin/PanoPanel.cpp                                            |   136 +-
 src/hugin1/hugin/PanoPanel.h                                              |     4 +
 src/hugin1/hugin/PreferencesDialog.cpp                                    |    18 +-
 src/hugin1/hugin/PreviewFrame.cpp                                         |    16 +-
 src/hugin1/hugin/PreviewIdentifyTool.cpp                                  |    26 +-
 src/hugin1/hugin/ResetDialog.cpp                                          |    20 +-
 src/hugin1/hugin/ResetDialog.h                                            |     6 +-
 src/hugin1/hugin/config_defaults.h                                        |     4 +-
 src/hugin1/hugin/huginApp.cpp                                             |    70 +-
 src/hugin1/hugin/treelistctrl.cpp                                         |  5435 ++++++++++
 src/hugin1/hugin/treelistctrl.h                                           |   586 +
 src/hugin1/hugin/wxPanoCommand.cpp                                        |    59 +-
 src/hugin1/hugin/wxPanoCommand.h                                          |    15 +-
 src/hugin1/hugin/xrc/CMakeLists.txt                                       |    27 +-
 src/hugin1/hugin/xrc/assistant_panel.xrc                                  |   366 -
 src/hugin1/hugin/xrc/batch_frame.xrc                                      |     1 +
 src/hugin1/hugin/xrc/crop_panel.xrc                                       |   155 -
 src/hugin1/hugin/xrc/data/hugin_small.png                                 |     0 
 src/hugin1/hugin/xrc/edit_script_dialog.xrc                               |     2 +-
 src/hugin1/hugin/xrc/image_variable_dlg.xrc                               |   594 +
 src/hugin1/hugin/xrc/images_panel.xrc                                     |   761 +-
 src/hugin1/hugin/xrc/lens_panel.xrc                                       |   859 -
 src/hugin1/hugin/xrc/main_frame.xrc                                       |    18 +-
 src/hugin1/hugin/xrc/main_menu.xrc                                        |   200 +-
 src/hugin1/hugin/xrc/mask_editor_panel.xrc                                |   535 +-
 src/hugin1/hugin/xrc/optimize_panel.xrc                                   |   807 +-
 src/hugin1/hugin/xrc/optimize_photo_panel.xrc                             |   498 +-
 src/hugin1/hugin/xrc/pano_panel.xrc                                       |     8 +-
 src/hugin1/hugin/xrc/pref_dialog.xrc                                      |   109 +-
 src/hugin1/hugin/xrc/preview_frame.xrc                                    |   437 +-
 src/hugin1/hugin/xrc/reset_dialog.xrc                                     |    16 +-
 src/hugin1/icpfind/default.mac                                            |     2 +-
 src/hugin1/icpfind/default.unix                                           |     2 +-
 src/hugin1/icpfind/default.win                                            |     2 +-
 src/hugin1/ptbatcher/FindPanoDialog.cpp                                   |     4 +
 src/hugin_base/CMakeLists.txt                                             |     1 +
 src/hugin_base/algorithms/basic/LayerStacks.cpp                           |     9 +-
 src/hugin_base/algorithms/basic/LayerStacks.h                             |     4 +-
 src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp |    10 +-
 src/hugin_base/huginapp/PanoCommand.h                                     |    22 +-
 src/hugin_base/panodata/OptimizerSwitches.h                               |    47 +
 src/hugin_base/panodata/Panorama.cpp                                      |   292 +-
 src/hugin_base/panodata/Panorama.h                                        |    37 +-
 src/hugin_base/panodata/PanoramaData.h                                    |    23 +-
 src/hugin_base/panodata/PanoramaOptions.h                                 |     7 +
 src/hugin_base/panodata/SrcPanoImage.cpp                                  |     2 +-
 src/hugin_base/panodata/SrcPanoImage.h                                    |     2 +-
 src/hugin_cpfind/cpfind/CMakeLists.txt                                    |     8 +-
 src/tools/pano_modify.cpp                                                 |     8 +-
 src/tools/pto_gen.cpp                                                     |     4 +
 140 files changed, 23529 insertions(+), 13939 deletions(-)

diffs (truncated from 45978 to 500 lines):

diff -r 0054c9609684 -r 11ab9286a061 CMakeLists.txt
--- a/CMakeLists.txt	Wed Jul 25 18:23:37 2012 +0200
+++ b/CMakeLists.txt	Wed Jul 25 18:54:18 2012 +0200
@@ -639,13 +639,44 @@
 IF(NOT DISABLE_DPKG)
   # Use dpkg-shlibdeps to get the needed dependences
   SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+
+  # the following part copied from http://www.cmake.org/Wiki/CMake_RPATH_handling
+  # use, i.e. don't skip the full RPATH for the build tree
+  SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+  # when building, don't use the install RPATH already
+  # (but later on when installing)
+  SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+
+  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/hugin")
+  SET(CPACK_DEBIAN_PACKAGE_DEBUG ON)
+
+  # add the automatically determined parts of the RPATH
+  # which point to directories outside the build tree to the install RPATH
+  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+
+  # the RPATH to be used when installing, but only if it's not a system directory
+  LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib/hugin" isSystemDir)
+  IF("${isSystemDir}" STREQUAL "-1")
+     SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/hugin")
+  ENDIF("${isSystemDir}" STREQUAL "-1")
+
+  #this environment will be used by dpkg-shlibdebs to find local created libs
+  string(REGEX REPLACE "^/(.*)" "\\1" LDLIBPATH "${CMAKE_INSTALL_RPATH}")
+  #message(STATUS "CMAKE_INSTALL_RPATH set to ${CMAKE_INSTALL_RPATH}")
+  #message(STATUS "LDLIBPATH = ${LDLIBPATH}")
+  set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_BINARY_DIR}/CPackEnv.cmake")
+  FILE(WRITE "${CPACK_PROJECT_CONFIG_FILE}" "set(ENV{LD_LIBRARY_PATH} \"${LDLIBPATH}\")")
+
 ELSE()
   # incomplete manually set dependencies but we don't really care since this package is not for distribution
   # and whoever use the DISABLE_DPKG option knows what they are doing
   SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libpano13(>=2.9.17)")
 ENDIF()
 
-SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/Debian/postinst")
+message(STATUS "Current source dir = ${CMAKE_CURRENT_SOURCE_DIR}")
+SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/Debian/postinst"
+				       "${CMAKE_CURRENT_SOURCE_DIR}/Debian/shlibs.local")
 INCLUDE(CPack)
 
 ##
diff -r 0054c9609684 -r 11ab9286a061 CMakeModules/FindExiv2.cmake
--- a/CMakeModules/FindExiv2.cmake	Wed Jul 25 18:23:37 2012 +0200
+++ b/CMakeModules/FindExiv2.cmake	Wed Jul 25 18:54:18 2012 +0200
@@ -71,6 +71,8 @@
                /usr/local/include
                /usr/include
                ${SOURCE_BASE_DIR}/exiv2/msvc/include
+               ${SOURCE_BASE_DIR}/exiv2-0.23/msvc64/include
+               ${SOURCE_BASE_DIR}/exiv2-0.23/msvc/include
                ${SOURCE_BASE_DIR}/exiv2-0.22/msvc/include
                ${SOURCE_BASE_DIR}/exiv2-0.21.1/msvc/include
                ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/include
@@ -87,32 +89,33 @@
        find_library_with_debug(EXIV2_LIBRARIES
           WIN32_DEBUG_POSTFIX d
           NAMES exiv2 libexiv2
-          PATHS ${SOURCE_BASE_DIR}/exiv2-0.22/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.21.1/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
+          PATHS ${SOURCE_BASE_DIR}/exiv2-0.23/msvc64/exiv2lib/x64/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.23/msvc64/exiv2lib/Win32/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.22/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.21.1/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
        )
 
        find_library_with_debug(EXIV2EXPAT_LIBRARIES
           WIN32_DEBUG_POSTFIX d
           NAMES libexpat
-          PATHS ${SOURCE_BASE_DIR}/expat-2.0.1/win32/bin/Release
+          PATHS ${SOURCE_BASE_DIR}/exiv2-0.23/msvc64/exiv2lib/x64/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.23/msvc64/exiv2lib/Win32/ReleaseDLL ${SOURCE_BASE_DIR}/expat-2.0.1/win32/bin/Release
        )
      ELSE(${HUGIN_SHARED})
        find_library_with_debug(EXIV2_LIBRARIES
           WIN32_DEBUG_POSTFIX d
           NAMES exiv2 libexiv2
-          PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.22/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/lib
+          PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.23/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.22/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/lib
        )
 
        find_library_with_debug(EXIV2EXPAT_LIBRARIES
           WIN32_DEBUG_POSTFIX d
           NAMES libexpat
-          PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.22/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/lib
+          PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.23/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.22/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/lib
        )
 
        # since exiv 0.19, xmpsdk needs explicit linked in static build
        find_library_with_debug(XMP_LIBRARIES
           WIN32_DEBUG_POSTFIX d
           NAMES xmpsdk
-          PATHS ${SOURCE_BASE_DIR}/exiv2-0.22/msvc/lib
+          PATHS ${SOURCE_BASE_DIR}/exiv2-0.23/msvc/lib
+                ${SOURCE_BASE_DIR}/exiv2-0.22/msvc/lib
                 ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/lib
                 ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib
        )
diff -r 0054c9609684 -r 11ab9286a061 CMakeModules/win_bundle.cmake
--- a/CMakeModules/win_bundle.cmake	Wed Jul 25 18:23:37 2012 +0200
+++ b/CMakeModules/win_bundle.cmake	Wed Jul 25 18:54:18 2012 +0200
@@ -158,14 +158,15 @@
     FILE(GLOB BOOST_REGEX_DLL ${Boost_LIBRARY_DIRS}/boost_regex*.dll)
     FILE(GLOB BOOST_SIGNALS_DLL ${Boost_LIBRARY_DIRS}/boost_signals*.dll)
     FILE(GLOB BOOST_FILESYSTEM_DLL ${Boost_LIBRARY_DIRS}/boost_filesystem*.dll)
+    FILE(GLOB BOOST_CHRONO_DLL ${Boost_LIBRARY_DIRS}/boost_chrono*.dll)
     FIND_FILE(EXIV2_DLL 
       NAMES exiv2.dll 
-      PATHS ${SOURCE_BASE_DIR}/exiv2-0.22/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.21.1/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
+      PATHS ${SOURCE_BASE_DIR}/exiv2-0.23/msvc64/bin/x64/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.23/msvc64/bin/Win32/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.22/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.21.1/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
       NO_SYSTEM_ENVIRONMENT_PATH
     )
     FIND_FILE(LIBEXPAT_DLL 
       NAMES libexpat.dll 
-      PATHS ${SOURCE_BASE_DIR}/expat-2.0.1/win32/bin/Release ${SOURCE_BASE_DIR}/exiv2-0.22/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.21.1/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
+      PATHS ${SOURCE_BASE_DIR}/exiv2-0.23/msvc64/bin/x64/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.23/msvc64/bin/Win32/ReleaseDLL ${SOURCE_BASE_DIR}/expat-2.0.1/win32/bin/Release ${SOURCE_BASE_DIR}/exiv2-0.22/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.21.1/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
       NO_SYSTEM_ENVIRONMENT_PATH
     )
     FIND_FILE(GLEW_DLL
@@ -180,28 +181,28 @@
     )
     # hand tuned dll, so that only necesarry dll are install and not all wxWidgets DLL to save space
     FIND_FILE(WXWIDGETS_DLL1 
-              NAMES wxbase293u_vc_custom.dll wxbase292u_vc_custom.dll wxbase291u_vc_custom.dll wxbase28u_vc_custom.dll 
+              NAMES wxbase294u_vc_custom.dll wxbase293u_vc_custom.dll wxbase292u_vc_custom.dll wxbase291u_vc_custom.dll wxbase28u_vc_custom.dll 
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL2 
-              NAMES wxmsw293u_core_vc_custom.dll wxmsw292u_core_vc_custom.dll wxmsw291u_core_vc_custom.dll wxmsw28u_core_vc_custom.dll
+              NAMES wxmsw294u_core_vc_custom.dll wxmsw293u_core_vc_custom.dll wxmsw292u_core_vc_custom.dll wxmsw291u_core_vc_custom.dll wxmsw28u_core_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL3 
-              NAMES wxmsw293u_xrc_vc_custom.dll wxmsw292u_xrc_vc_custom.dll wxmsw291u_xrc_vc_custom.dll wxmsw28u_xrc_vc_custom.dll
+              NAMES wxmsw294u_xrc_vc_custom.dll wxmsw293u_xrc_vc_custom.dll wxmsw292u_xrc_vc_custom.dll wxmsw291u_xrc_vc_custom.dll wxmsw28u_xrc_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL4 
-              NAMES wxmsw293u_adv_vc_custom.dll wxmsw292u_adv_vc_custom.dll wxmsw291u_adv_vc_custom.dll wxmsw28u_adv_vc_custom.dll
+              NAMES wxmsw294u_adv_vc_custom.dll wxmsw293u_adv_vc_custom.dll wxmsw292u_adv_vc_custom.dll wxmsw291u_adv_vc_custom.dll wxmsw28u_adv_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL5 
-              NAMES wxmsw293u_gl_vc_custom.dll wxmsw292u_gl_vc_custom.dll wxmsw291u_gl_vc_custom.dll wxmsw28u_gl_vc_custom.dll
+              NAMES wxmsw294u_gl_vc_custom.dll wxmsw293u_gl_vc_custom.dll wxmsw292u_gl_vc_custom.dll wxmsw291u_gl_vc_custom.dll wxmsw28u_gl_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL6 
-              NAMES wxmsw293u_html_vc_custom.dll wxmsw292u_html_vc_custom.dll wxmsw291u_html_vc_custom.dll wxmsw28u_html_vc_custom.dll
+              NAMES wxmsw294u_html_vc_custom.dll wxmsw293u_html_vc_custom.dll wxmsw292u_html_vc_custom.dll wxmsw291u_html_vc_custom.dll wxmsw28u_html_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL7 
-              NAMES wxbase293u_xml_vc_custom.dll wxbase292u_xml_vc_custom.dll wxbase291u_xml_vc_custom.dll wxbase28u_xml_vc_custom.dll
+              NAMES wxbase294u_xml_vc_custom.dll wxbase293u_xml_vc_custom.dll wxbase292u_xml_vc_custom.dll wxbase291u_xml_vc_custom.dll wxbase28u_xml_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(WXWIDGETS_DLL8 
-              NAMES wxmsw293u_aui_vc_custom.dll wxmsw292u_aui_vc_custom.dll wxmsw291u_aui_vc_custom.dll wxmsw28u_aui_vc_custom.dll
+              NAMES wxmsw294u_aui_vc_custom.dll wxmsw293u_aui_vc_custom.dll wxmsw292u_aui_vc_custom.dll wxmsw291u_aui_vc_custom.dll wxmsw28u_aui_vc_custom.dll
               PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
 
     INSTALL(FILES ${TIFF_DLL} ${JPEG_DLL} ${PNG_DLL} ${ZLIB_DLL} ${OPENEXR_DLL} 
@@ -213,7 +214,10 @@
         ${WXWIDGETS_DLL7} ${WXWIDGETS_DLL8}
         DESTINATION ${BINDIR}
     )
-
+    IF(NOT "${BOOST_CHRONO_DLL}" MATCHES "-NOTFOUND")
+        INSTALL(FILES ${BOOST_CHRONO_DLL} DESTINATION ${BINDIR})
+    ENDIF()
+    
     FIND_FILE(LENSFUN_DLL NAMES lensfun.dll PATHS ${SOURCE_BASE_DIR}/lensfun/bin NO_SYSTEM_ENVIRONMENT_PATH)
     FIND_FILE(LENSFUN_GLIB2_DLL NAMES glib-2.dll PATHS ${SOURCE_BASE_DIR}/lensfun/bin NO_SYSTEM_ENVIRONMENT_PATH)
     INSTALL(FILES ${LENSFUN_DLL} ${LENSFUN_GLIB2_DLL} DESTINATION ${BINDIR})
diff -r 0054c9609684 -r 11ab9286a061 mac/BuildConfig.xcconfig.orig
--- a/mac/BuildConfig.xcconfig.orig	Wed Jul 25 18:23:37 2012 +0200
+++ b/mac/BuildConfig.xcconfig.orig	Wed Jul 25 18:54:18 2012 +0200
@@ -39,9 +39,10 @@
 PER_ARCH_CFLAGS_x86_64 = -march=core2 -mtune=core2 -ftree-vectorize
 
 // wxWidgets
-WX_MAJOR_VERSION = 2.8
+WX_MAJOR_VERSION = 2.9
+WX_VERSION = 2.9.3
 // See comments above for REPOSITORY_DIR. This may need to be a fully qualified path.
-WX_LOCALE_DIR = ../mac/ExternalPrograms/wxMac-2.8.12/locale
+WX_LOCALE_DIR = ../mac/ExternalPrograms/wxWidgets-2.9.3/locale
 
 // gettext
 GETTEXT_VERSION = 0.17
diff -r 0054c9609684 -r 11ab9286a061 mac/ExternalPrograms/scripts/wxmac29.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mac/ExternalPrograms/scripts/wxmac29.sh	Wed Jul 25 18:54:18 2012 +0200
@@ -0,0 +1,270 @@
+# ------------------
+#     wxMac 2.9
+# ------------------
+# $Id: wxmac29.sh 1902 2007-02-04 22:27:47Z ippei $
+# Copyright (c) 2007-2008, Ippei Ukai
+
+# 2009-12-04.0 Remove unneeded arguments to make and make install; made make single threaded
+
+
+# prepare
+
+# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \
+#  ARCHS="ppc i386" \
+#  ppcTARGET="powerpc-apple-darwin8" \
+#  ppcOSVERSION="10.4" \
+#  ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \
+#  ppcOPTIMIZE="-mcpu=G3 -mtune=G4" \
+#  i386TARGET="i386-apple-darwin8" \
+#  i386OSVERSION="10.4" \
+#  i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \
+#  i386OPTIMIZE ="-march=prescott -mtune=pentium-m -ftree-vectorize" \
+#  OTHERARGs="";
+
+# -------------------------------
+# 20091206.0 sg Script tested and used to build 2009.4.0-RC3
+#               Works Intel: 10.5, 10.6 & Powerpc 10.4, 10.5
+# 20100624.0 hvdw More robust error checking on compilation
+# 20120415.0 hvdw upgrade to 2.8.12
+# 20120526.0 hvdw upgrade to 2.9.3 and rename to wxmac29.sh
+# -------------------------------
+
+fail()
+{
+        echo "** Failed at $1 **"
+        exit 1
+}
+
+
+uname_release=$(uname -r)
+uname_arch=$(uname -p)
+[ $uname_arch = powerpc ] && uname_arch="ppc"
+os_dotvsn=${uname_release%%.*}
+os_dotvsn=$(($os_dotvsn - 4))
+case $os_dotvsn in
+ 4 ) os_sdkvsn="10.4u" ;;
+ 5|6 ) os_sdkvsn=10.$os_dotvsn ;;
+ * ) echo "Unhandled OS Version: 10.$os_dotvsn. Build aborted."; exit 1 ;;
+esac
+
+NATIVE_SDKDIR="/Developer/SDKs/MacOSX$os_sdkvsn.sdk"
+NATIVE_OSVERSION="10.$os_dotvsn"
+NATIVE_ARCH=$uname_arch
+NATIVE_OPTIMIZE=""
+
+WX_MAJOR_VERSION="2.9"
+WXVERSION="2.9.3"
+WXVER_FULL="$WXVERSION.0.0" 
+
+mkdir -p "$REPOSITORYDIR/bin";
+mkdir -p "$REPOSITORYDIR/lib";
+mkdir -p "$REPOSITORYDIR/include";
+
+
+# compile
+
+let NUMARCH="0"
+
+for ARCH in $ARCHS
+do
+
+ mkdir -p "osx-$ARCH-build";
+ cd "osx-$ARCH-build";
+
+ mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin";
+ mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib";
+ mkdir -p "$REPOSITORYDIR/arch/$ARCH/include";
+
+ ARCHARGs=""
+ MACSDKDIR=""
+
+ if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then
+   TARGET=$i386TARGET
+   MACSDKDIR=$i386MACSDKDIR
+   ARCHARGs="$i386ONLYARG"
+   OSVERSION="$i386OSVERSION"
+   CC=$i386CC
+   CXX=$i386CXX
+  elif [ $ARCH = "x86_64" ] ; then
+   TARGET=$x64TARGET
+   MACSDKDIR=$x64MACSDKDIR
+   ARCHARGs="$x64ONLYARG"
+   OSVERSION="$x64OSVERSION"
+   CC=$x64CC
+   CXX=$x64CXX
+fi
+ 
+ ARCHARGs=$(echo $ARCHARGs | sed 's/-ftree-vectorize//')
+ env \
+  CC=$CC CXX=$CXX \
+  CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \
+  CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \
+  CPPFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip -I$REPOSITORYDIR/include" \
+  OBJCFLAGS="-arch $ARCH" \
+  OBJCXXFLAGS="-arch $ARCH" \
+  LDFLAGS="-L$REPOSITORYDIR/lib -arch $ARCH -mmacosx-version-min=$OSVERSION -dead_strip -prebind" \
+  ../configure --prefix="$REPOSITORYDIR" --exec-prefix=$REPOSITORYDIR/arch/$ARCH --disable-dependency-tracking \
+    --host="$TARGET" --with-macosx-sdk=$MACSDKDIR --with-macosx-version-min=$OSVERSION \
+    --enable-monolithic --enable-unicode --with-opengl --disable-graphics_ctx \
+    --with-libiconv-prefix=$REPOSITORYDIR --with-libjpeg --with-libtiff --with-libpng --with-zlib \
+    --with-cocoa --without-sdl --disable-sdltest \
+    --enable-shared --disable-debug --enable-aui || fail "configure step for $ARCH";
+
+# need to find out where setup.h was created. This seems to vary if building on powerpc and
+# is different under 10.4 and 10.5
+ whereIsSetup=$(find . -name setup.h -print)
+ whereIsSetup=${whereIsSetup#./}
+
+# echo '#ifndef wxMAC_USE_CORE_GRAPHICS'    >> $whereIsSetup
+# echo ' #define wxMAC_USE_CORE_GRAPHICS 0' >> $whereIsSetup
+# echo '#endif'                             >> $whereIsSetup
+# echo ''                                   >> $whereIsSetup
+#fi
+
+ make clean;
+
+#hack
+ cp utils/wxrc/Makefile utils/wxrc/Makefile-copy;
+ echo "all: " > utils/wxrc/Makefile;
+ echo "" >> utils/wxrc/Makefile;
+ echo "install: " >> utils/wxrc/Makefile;
+#~hack
+
+ case $NATIVE_OSVERSION in
+	 10.4 )
+     dylib_name="dylib1.o"
+		 ;;
+	 10.5 | 10.6 )
+		 dylib_name="dylib1.10.5.o"
+		 ;;
+	 * )
+		 echo "OS Version $NATIVE_OSVERSION not supported"; exit 1
+		 ;;
+ esac
+ cp $NATIVE_SDKDIR/usr/lib/$dylib_name $REPOSITORYDIR/lib/
+
+# Need to build single-threaded. libwx_osx_cocoau-2.8.dylib needs to be built before libwx_osx_cocoau_gl-2.8 to avoid a link error.
+# This is only problematic for Intel builds, where jobs can be >1
+ make --jobs=1 || fail "failed at make step of $ARCH";
+ make install || fail "make install step of $ARCH";
+
+ rm $REPOSITORYDIR/lib/$dylib_name;
+
+ cd ../;
+
+
+done
+
+
+# merge libwx
+
+for liba in "lib/libwx_osx_cocoau-$WXVER_FULL.dylib" "lib/libwx_osx_cocoau_gl-$WXVER_FULL.dylib"
+do
+  if [ $NUMARCH -eq 1 ] ; then
+   if [ -f $REPOSITORYDIR/arch/$ARCHS/$liba ] ; then
+		 echo "Moving arch/$ARCHS/$liba to $liba"
+  	 mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba";
+	   #Power programming: if filename ends in "a" then ...
+	   [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba";
+  	 continue
+	 else
+		 echo "Program arch/$ARCHS/$liba not found. Aborting build";
+		 exit 1;
+	 fi
+  fi
+
+  LIPOARGs=""
+  for ARCH in $ARCHS
+  do
+	if [ -f $REPOSITORYDIR/arch/$ARCH/$liba ] ; then
+		echo "Adding arch/$ARCH/$liba to bundle"
+		LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba"
+	else
+		echo "File arch/$ARCH/$liba was not found. Aborting build";
+		exit 1;
+	fi
+  done
+
+  lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba";
+done
+
+
+if [ -f "$REPOSITORYDIR/lib/libwx_osx_cocoau-$WXVER_FULL.dylib" ]
+then
+ install_name_tool \
+  -id "$REPOSITORYDIR/lib/libwx_osx_cocoau-$WXVERSION.dylib" \
+  "$REPOSITORYDIR/lib/libwx_osx_cocoau-$WXVER_FULL.dylib";
+ ln -sfn "libwx_osx_cocoau-$WXVER_FULL.dylib" "$REPOSITORYDIR/lib/libwx_osx_cocoau-$WXVERSION.dylib";
+fi
+if [ -f "$REPOSITORYDIR/lib/libwx_osx_cocoau_gl-$WXVER_FULL.dylib" ]
+then
+ install_name_tool \
+  -id "$REPOSITORYDIR/lib/libwx_osx_cocoau_gl-$WXVERSION.dylib" \
+  "$REPOSITORYDIR/lib/libwx_osx_cocoau_gl-$WXVER_FULL.dylib";
+ for ARCH in $ARCHS
+ do
+  install_name_tool \
+   -change "$REPOSITORYDIR/arch/$ARCH/lib/libwx_osx_cocoau-$WXVERSION.dylib" \
+   "$REPOSITORYDIR/lib/libwx_osx_cocoau-$WXVERSION.dylib" \
+   "$REPOSITORYDIR/lib/libwx_osx_cocoau_gl-$WXVER_FULL.dylib";
+ done
+ ln -sfn "libwx_osx_cocoau_gl-$WXVER_FULL.dylib" "$REPOSITORYDIR/lib/libwx_osx_cocoau_gl-$WXVERSION.dylib";
+fi
+
+
+# merge setup.h
+
+for dummy in "wx/setup.h"
+do
+
+ wxmacconf="lib/wx/include/mac-unicode-release-$WXVERSION/wx/setup.h"
+
+ mkdir -p $(dirname "$REPOSITORYDIR/$wxmacconf")
+ echo ""  >$REPOSITORYDIR/$wxmacconf
+
+ if [ $NUMARCH -eq 1 ] ; then
+   ARCH=$ARCHS
+   pushd $REPOSITORYDIR
+         whereIsSetup=$(find ./arch/$ARCH/lib/wx -name setup.h -print)
+         whereIsSetup=${whereIsSetup#./arch/*/}
+         popd
+         cat "$REPOSITORYDIR/arch/$ARCH/$whereIsSetup" >>"$REPOSITORYDIR/$wxmacconf";
+   continue
+ fi
+
+ for ARCH in $ARCHS
+ do
+
+         pushd $REPOSITORYDIR
+         whereIsSetup=$(find ./arch/$ARCH/lib/wx -name setup.h -print)
+         whereIsSetup=${whereIsSetup#./arch/*/}
+         popd
+
+   if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then
+     echo "#if defined(__i386__)"                       >> "$REPOSITORYDIR/$wxmacconf";
+     echo ""                                            >> "$REPOSITORYDIR/$wxmacconf";
+                 cat "$REPOSITORYDIR/arch/$ARCH/$whereIsSetup"      >> "$REPOSITORYDIR/$wxmacconf";
+     echo ""                                            >> "$REPOSITORYDIR/$wxmacconf";
+     echo "#endif"                                      >> "$REPOSITORYDIR/$wxmacconf";
+   elif [ $ARCH = "x86_64" ] ; then
+     echo "#if defined(__x86_64__)"  >> "$REPOSITORYDIR/$wxmacconf";
+     echo ""                                            >> "$REPOSITORYDIR/$wxmacconf";
+                 cat "$REPOSITORYDIR/arch/$ARCH/$whereIsSetup"      >> "$REPOSITORYDIR/$wxmacconf";
+     echo ""                                            >> "$REPOSITORYDIR/$wxmacconf";
+     echo "#endif"                                      >> "$REPOSITORYDIR/$wxmacconf";
+  else
+                 echo "Unhandled ARCH: $ARCH. Aborting build."; exit 1
+   fi
+ done
+
+done
+
+#wx-config
+for ARCH in $ARCHS
+do
+ sed -e 's/^exec_prefix.*$/exec_prefix=\$\{prefix\}/' \
+     -e 's/^is_cross \&\& target.*$//' \
+     -e 's/-arch '$ARCH'//' \
+     $REPOSITORYDIR/arch/$ARCH/bin/wx-config > $REPOSITORYDIR/bin/wx-config
+ break;
+done
diff -r 0054c9609684 -r 11ab9286a061 mac/Hugin.xcodeproj/project.pbxproj
--- a/mac/Hugin.xcodeproj/project.pbxproj	Wed Jul 25 18:23:37 2012 +0200
+++ b/mac/Hugin.xcodeproj/project.pbxproj	Wed Jul 25 18:54:18 2012 +0200
@@ -349,7 +349,6 @@
 		574092C10C3943D000D16607 /* Stitcher3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F4A0C391053005818A4 /* Stitcher3.cpp */; };
 		574092C20C3943D000D16607 /* Stitcher4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F4B0C391053005818A4 /* Stitcher4.cpp */; };
 		57525A390C54BCCB00BF8096 /* nona_gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E330BF0C4A87F2006AA781 /* nona_gui.cpp */; };
-		57525A3C0C54BCEA00BF8096 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; };
 		57525A410C54BCEA00BF8096 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
 		57525A420C54BCEA00BF8096 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		57525A430C54BCEA00BF8096 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; };
@@ -357,7 +356,7 @@
 		57525A450C54BCEA00BF8096 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
 		57525A460C54BCEA00BF8096 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };
 		57525A470C54BCEA00BF8096 /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.dylib */; };
-		57525A480C54BCEA00BF8096 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; };
+		57525A480C54BCEA00BF8096 /* libwx_osx_cocoau-2.9.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_osx_cocoau-2.9.3.dylib */; };
 		57525A4B0C54BCEA00BF8096 /* libIex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.dylib */; };
 		57525A4C0C54BCEA00BF8096 /* libIlmImf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.dylib */; };
 		57525A4D0C54BCEA00BF8096 /* libIlmThread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.dylib */; };
@@ -424,7 +423,7 @@
 		576900F40D24D3DC00A6AD01 /* PTWXDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A450D088CFD00344F55 /* PTWXDlg.cpp */; };
 		576900F60D24D3DC00A6AD01 /* huginConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A490D088CFD00344F55 /* huginConfig.cpp */; };
 		576900F70D24D3DC00A6AD01 /* platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57565A4B0D088CFD00344F55 /* platform.cpp */; };
-		576900F80D24D3DC00A6AD01 /* libwx_macu-2.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.8.dylib */; };
+		576900F80D24D3DC00A6AD01 /* libwx_osx_cocoau-2.9.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_osx_cocoau-2.9.3.dylib */; };
 		576900FA0D24D3DC00A6AD01 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; };
 		576900FB0D24D3DC00A6AD01 /* libpano13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.dylib */; };
 		576900FC0D24D3DC00A6AD01 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57565A640D088DAD00344F55 /* libboost_thread.dylib */; };
@@ -754,7 +753,6 @@
 		57D3832B0E236B1D00445A37 /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; };
 		57D3832C0E236B1D00445A37 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; };
 		57D3832D0E236B1D00445A37 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; };
-		57D50A390F595A6300CCDCB5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; };
 		57D50A3B0F595A6300CCDCB5 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; };
 		57D50A3C0F595A6300CCDCB5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; };
 		57D50A3D0F595A6300CCDCB5 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; };
@@ -762,7 +760,7 @@
 		57D50A3F0F595A6300CCDCB5 /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.dylib */; };
 		57D50A400F595A6300CCDCB5 /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.dylib */; };

[Hugin-cvs] /hgroot/hugin/hugin: Closing gui_overhaul branch

From: <hugin-cvs@li...> - 2012-07-25 17:17

branch:     gui_overhaul
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/afbc1e2ec412
changeset:  5913:afbc1e2ec412
user:       tmodes
date:       Wed Jul 25 18:24:27 2012 +0200
description:

Closing gui_overhaul branch

[Hugin-cvs] /hgroot/hugin/hugin: update python api versions (Stefan Peter) i...

From: <hugin-cvs@li...> - 2012-07-25 12:42

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/377ba08a46ba
changeset:  5912:377ba08a46ba
user:       harryvanderwolf <hvdwolf@...>
date:       Tue Jul 24 19:55:18 2012 +0200
description:

update python api versions (Stefan Peter) in trunk

diffstat:

 src/hugin_script_interface/plugins-dev/dual_use.py        |  2 +-
 src/hugin_script_interface/plugins-dev/plugin_skeleton.py |  2 +-
 src/hugin_script_interface/plugins/crop_cp.py             |  2 +-
 src/hugin_script_interface/plugins/shooting_pattern.py    |  2 +-
 src/hugin_script_interface/plugins/top_five.py            |  2 +-
 src/hugin_script_interface/plugins/woa.py                 |  2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diffs (72 lines):

diff -r 06831c869c52 -r 377ba08a46ba src/hugin_script_interface/plugins-dev/dual_use.py
--- a/src/hugin_script_interface/plugins-dev/dual_use.py	Tue Jul 24 11:21:09 2012 +0200
+++ b/src/hugin_script_interface/plugins-dev/dual_use.py	Tue Jul 24 19:55:18 2012 +0200
@@ -24,7 +24,7 @@
 # @category Examples
 # @name     Dual Use Plugin
 # @api-min  2011.1.0
-# @api-max  2011.5.0
+# @api-max  2012.0.0
 
 # dual_use will function as a hugin plugin and as a standalone
 # Python script.
diff -r 06831c869c52 -r 377ba08a46ba src/hugin_script_interface/plugins-dev/plugin_skeleton.py
--- a/src/hugin_script_interface/plugins-dev/plugin_skeleton.py	Tue Jul 24 11:21:09 2012 +0200
+++ b/src/hugin_script_interface/plugins-dev/plugin_skeleton.py	Tue Jul 24 19:55:18 2012 +0200
@@ -19,7 +19,7 @@
 # @category Examples
 # @name     Skeleton Plugin
 # @api-min  2011.1.0
-# @api-max  2011.5.0
+# @api-max  2012.0.0
 
 # we use modern type python print statements:
 
diff -r 06831c869c52 -r 377ba08a46ba src/hugin_script_interface/plugins/crop_cp.py
--- a/src/hugin_script_interface/plugins/crop_cp.py	Tue Jul 24 11:21:09 2012 +0200
+++ b/src/hugin_script_interface/plugins/crop_cp.py	Tue Jul 24 19:55:18 2012 +0200
@@ -24,7 +24,7 @@
 # @category Control Points
 # @name     Crop Control Points
 # @api-min  2011.1
-# @api-max  2011.5
+# @api-max  2012.0
 
 # crop_cps will function as a hugin plugin and as a standalone
 # Python script. It can also serve as a template for a slightly
diff -r 06831c869c52 -r 377ba08a46ba src/hugin_script_interface/plugins/shooting_pattern.py
--- a/src/hugin_script_interface/plugins/shooting_pattern.py	Tue Jul 24 11:21:09 2012 +0200
+++ b/src/hugin_script_interface/plugins/shooting_pattern.py	Tue Jul 24 19:55:18 2012 +0200
@@ -41,7 +41,7 @@
 # @name     6-1-1 Shooting Pattern
 # @description apply a shooting pattern (6 around, 1 up 1 down)
 # @sys win nix mac
-# @api-max 2011.5.0
+# @api-max 2012.0.0
 # @api-min 2011.1.0
 
 # the position routine will apply yaw, pitch to an image
diff -r 06831c869c52 -r 377ba08a46ba src/hugin_script_interface/plugins/top_five.py
--- a/src/hugin_script_interface/plugins/top_five.py	Tue Jul 24 11:21:09 2012 +0200
+++ b/src/hugin_script_interface/plugins/top_five.py	Tue Jul 24 19:55:18 2012 +0200
@@ -5,7 +5,7 @@
 # @category Control Points
 # @name     keep 5 CPs per image pair
 # @api-min  2011.1
-# @api-max  2011.5
+# @api-max  2012.0
 
 #    top_five.py - keep the five best CPs for each image pair
 
diff -r 06831c869c52 -r 377ba08a46ba src/hugin_script_interface/plugins/woa.py
--- a/src/hugin_script_interface/plugins/woa.py	Tue Jul 24 11:21:09 2012 +0200
+++ b/src/hugin_script_interface/plugins/woa.py	Tue Jul 24 19:55:18 2012 +0200
@@ -25,7 +25,7 @@
 # @category Control Points
 # @name     Warped Overlap Analysis
 # @api-min  2011.1
-# @api-max  2011.5
+# @api-max  2012.0
 
 # note that if you want to read the script, it's written bottom-up, so the
 # higher-level routines are towards the end.

[Hugin-cvs] /hgroot/hugin/hugin: commit updated Danish translation to 2012.0...

From: <hugin-cvs@li...> - 2012-07-25 12:42

branch:     2012.0
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/9bc6aa6bc81d
changeset:  5910:9bc6aa6bc81d
user:       harryvanderwolf <hvdwolf@...>
date:       Tue Jul 24 11:24:18 2012 +0200
description:

commit updated Danish translation to 2012.0 release branch

diffstat:

 src/translations/da.po |  4821 ++++++++++++++++++++++++++++-------------------
 1 files changed, 2899 insertions(+), 1922 deletions(-)

diffs (truncated from 8051 to 500 lines):

diff -r c020c705dcb2 -r 9bc6aa6bc81d src/translations/da.po
--- a/src/translations/da.po	Tue Jul 24 11:13:28 2012 +0200
+++ b/src/translations/da.po	Tue Jul 24 11:24:18 2012 +0200
@@ -8,7 +8,7 @@
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
 "POT-Creation-Date: 2012-07-23 06:47+0200\n"
-"PO-Revision-Date: 2012-05-08 10:33+0100\n"
+"PO-Revision-Date: 2012-07-23 22:36+0100\n"
 "Last-Translator: Thomas Pryds <thomas@..."
 "Language-Team: danish <da@..."
 "Language: \n"
@@ -16,72 +16,98 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82
+#: hugin1/base_wx/huginConfig.cpp:47
+#: hugin1/base_wx/huginConfig.cpp:82
 #, c-format
-msgid ""
-"External program %s not found as specified in preferences, reverting to "
-"bundled version"
-msgstr ""
-"Eksternt program %s blev ikke fundet som angivet i indstillingerne; bruger i "
-"stedet versionen i programpakken"
-
-#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:57
-#: hugin1/base_wx/huginConfig.cpp:69 hugin1/base_wx/huginConfig.cpp:82
-#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/RunStitchPanel.cpp:111
-#: hugin1/base_wx/wxLensDB.cpp:749 hugin1/base_wx/wxLensDB.cpp:762
-#: hugin1/base_wx/wxLensDB.cpp:808 hugin1/base_wx/wxLensDB.cpp:815
-#: hugin1/base_wx/wxLensDB.cpp:820 hugin1/base_wx/wxLensDB.cpp:983
+msgid "External program %s not found as specified in preferences, reverting to bundled version"
+msgstr "Eksternt program %s blev ikke fundet som angivet i indstillingerne; bruger i stedet versionen i programpakken"
+
+#: hugin1/base_wx/huginConfig.cpp:47
+#: hugin1/base_wx/huginConfig.cpp:57
+#: hugin1/base_wx/huginConfig.cpp:69
+#: hugin1/base_wx/huginConfig.cpp:82
+#: hugin1/base_wx/platform.cpp:125
+#: hugin1/base_wx/RunStitchPanel.cpp:111
+#: hugin1/base_wx/wxLensDB.cpp:749
+#: hugin1/base_wx/wxLensDB.cpp:762
+#: hugin1/base_wx/wxLensDB.cpp:808
+#: hugin1/base_wx/wxLensDB.cpp:815
+#: hugin1/base_wx/wxLensDB.cpp:820
+#: hugin1/base_wx/wxLensDB.cpp:983
 #: hugin1/calibrate_lens/LensCalFrame.cpp:101
 #: hugin1/calibrate_lens/LensCalFrame.cpp:402
 #: hugin1/calibrate_lens/LensCalFrame.cpp:466
-#: hugin1/hugin/AssistantPanel.cpp:365 hugin1/hugin/AssistantPanel.cpp:433
-#: hugin1/hugin/AssistantPanel.cpp:481 hugin1/hugin/AssistantPanel.cpp:491
-#: hugin1/hugin/AssistantPanel.cpp:503 hugin1/hugin/AssistantPanel.cpp:509
-#: hugin1/hugin/CPEditorPanel.cpp:1783 hugin1/hugin/GLViewer.cpp:153
-#: hugin1/hugin/GLViewer.cpp:163 hugin1/hugin/LensPanel.cpp:843
-#: hugin1/hugin/MainFrame.cpp:185 hugin1/hugin/MainFrame.cpp:746
-#: hugin1/hugin/MainFrame.cpp:1026 hugin1/hugin/MainFrame.cpp:1567
+#: hugin1/hugin/AssistantPanel.cpp:365
+#: hugin1/hugin/AssistantPanel.cpp:433
+#: hugin1/hugin/AssistantPanel.cpp:481
+#: hugin1/hugin/AssistantPanel.cpp:491
+#: hugin1/hugin/AssistantPanel.cpp:503
+#: hugin1/hugin/AssistantPanel.cpp:509
+#: hugin1/hugin/CPEditorPanel.cpp:1783
+#: hugin1/hugin/GLViewer.cpp:153
+#: hugin1/hugin/GLViewer.cpp:163
+#: hugin1/hugin/LensPanel.cpp:843
+#: hugin1/hugin/MainFrame.cpp:185
+#: hugin1/hugin/MainFrame.cpp:746
+#: hugin1/hugin/MainFrame.cpp:1026
+#: hugin1/hugin/MainFrame.cpp:1567
 #: hugin1/hugin/MainFrame.cpp:2064
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:565
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:585
-#: hugin1/hugin/PanoPanel.cpp:997 hugin1/hugin/PanoPanel.cpp:1060
-#: hugin1/hugin/PanoPanel.cpp:1188 hugin1/hugin/PanoPanel.cpp:1206
+#: hugin1/hugin/PanoPanel.cpp:997
+#: hugin1/hugin/PanoPanel.cpp:1060
+#: hugin1/hugin/PanoPanel.cpp:1188
+#: hugin1/hugin/PanoPanel.cpp:1206
 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:246
-#: hugin1/ptbatcher/BatchFrame.cpp:455 hugin1/ptbatcher/FindPanoDialog.cpp:283
+#: hugin1/ptbatcher/BatchFrame.cpp:455
+#: hugin1/ptbatcher/FindPanoDialog.cpp:283
 #: hugin1/ptbatcher/ProjectListBox.cpp:169
 #: hugin1/stitch_project/hugin_stitch_project.cpp:411
 msgid "Error"
 msgstr "Fejl"
 
-#: hugin1/base_wx/huginConfig.cpp:57 hugin1/base_wx/huginConfig.cpp:69
-#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/RunStitchPanel.cpp:111
-#: hugin1/hugin/AssistantPanel.cpp:481 hugin1/hugin/PanoPanel.cpp:1206
+#: hugin1/base_wx/huginConfig.cpp:57
+#: hugin1/base_wx/huginConfig.cpp:69
+#: hugin1/base_wx/platform.cpp:125
+#: hugin1/base_wx/RunStitchPanel.cpp:111
+#: hugin1/hugin/AssistantPanel.cpp:481
+#: hugin1/hugin/PanoPanel.cpp:1206
 #, c-format
 msgid "External program %s not found in the bundle, reverting to system path"
-msgstr ""
-"Eksternt program %s blev ikke fundet i programpakken; bruger i stedet "
-"systemsti"
-
-#: hugin1/base_wx/huginConfig.cpp:95 hugin1/base_wx/huginConfig.cpp:109
+msgstr "Eksternt program %s blev ikke fundet i programpakken; bruger i stedet systemsti"
+
+#: hugin1/base_wx/huginConfig.cpp:95
+#: hugin1/base_wx/huginConfig.cpp:109
 #, c-format
 msgid "Program %s not found in preferences, reverting to default value"
-msgstr ""
-"Programmet %s blev ikke fundet i indstillingerne, bruger i stedet "
-"standardværdi"
-
-#: hugin1/base_wx/huginConfig.cpp:129 hugin1/base_wx/huginConfig.cpp:134
-#: hugin1/base_wx/huginConfig.cpp:140 hugin1/base_wx/huginConfig.cpp:145
-#: hugin1/base_wx/huginConfig.cpp:150 hugin1/base_wx/huginConfig.cpp:155
-#: hugin1/base_wx/huginConfig.cpp:161 hugin1/base_wx/huginConfig.cpp:166
-#: hugin1/base_wx/huginConfig.cpp:171 hugin1/base_wx/huginConfig.cpp:176
-#: hugin1/base_wx/huginConfig.cpp:182 hugin1/base_wx/huginConfig.cpp:187
-#: hugin1/base_wx/huginConfig.cpp:194 hugin1/base_wx/huginConfig.cpp:199
-#: hugin1/base_wx/huginConfig.cpp:219 hugin1/base_wx/huginConfig.cpp:224
-#: hugin1/base_wx/huginConfig.cpp:230 hugin1/base_wx/huginConfig.cpp:235
-#: hugin1/base_wx/huginConfig.cpp:240 hugin1/base_wx/huginConfig.cpp:245
-#: hugin1/base_wx/huginConfig.cpp:253 hugin1/base_wx/wxLensDB.cpp:232
-#: hugin1/base_wx/wxLensDB.cpp:607 hugin1/base_wx/wxLensDB.cpp:659
-#: hugin1/base_wx/wxLensDB.cpp:931 hugin1/base_wx/wxLensDB.cpp:936
+msgstr "Programmet %s blev ikke fundet i indstillingerne, bruger i stedet standardværdi"
+
+#: hugin1/base_wx/huginConfig.cpp:129
+#: hugin1/base_wx/huginConfig.cpp:134
+#: hugin1/base_wx/huginConfig.cpp:140
+#: hugin1/base_wx/huginConfig.cpp:145
+#: hugin1/base_wx/huginConfig.cpp:150
+#: hugin1/base_wx/huginConfig.cpp:155
+#: hugin1/base_wx/huginConfig.cpp:161
+#: hugin1/base_wx/huginConfig.cpp:166
+#: hugin1/base_wx/huginConfig.cpp:171
+#: hugin1/base_wx/huginConfig.cpp:176
+#: hugin1/base_wx/huginConfig.cpp:182
+#: hugin1/base_wx/huginConfig.cpp:187
+#: hugin1/base_wx/huginConfig.cpp:194
+#: hugin1/base_wx/huginConfig.cpp:199
+#: hugin1/base_wx/huginConfig.cpp:219
+#: hugin1/base_wx/huginConfig.cpp:224
+#: hugin1/base_wx/huginConfig.cpp:230
+#: hugin1/base_wx/huginConfig.cpp:235
+#: hugin1/base_wx/huginConfig.cpp:240
+#: hugin1/base_wx/huginConfig.cpp:245
+#: hugin1/base_wx/huginConfig.cpp:253
+#: hugin1/base_wx/wxLensDB.cpp:232
+#: hugin1/base_wx/wxLensDB.cpp:607
+#: hugin1/base_wx/wxLensDB.cpp:659
+#: hugin1/base_wx/wxLensDB.cpp:931
+#: hugin1/base_wx/wxLensDB.cpp:936
 #: hugin1/calibrate_lens/LensCalFrame.cpp:415
 #: hugin1/calibrate_lens/LensCalFrame.cpp:594
 #: hugin1/calibrate_lens/LensCalFrame.cpp:617
@@ -90,54 +116,70 @@
 #: hugin1/calibrate_lens/LensCalFrame.cpp:768
 #: hugin1/calibrate_lens/LensCalFrame.cpp:794
 #: hugin1/calibrate_lens/LensCalFrame.cpp:866
-#: hugin1/hugin/AssistantPanel.cpp:437 hugin1/hugin/CPDetectorDialog.cpp:121
-#: hugin1/hugin/GLPreviewFrame.cpp:1398 hugin1/hugin/GLPreviewFrame.cpp:1405
-#: hugin1/hugin/GLPreviewFrame.cpp:1412 hugin1/hugin/GLPreviewFrame.cpp:1426
-#: hugin1/hugin/GLPreviewFrame.cpp:1433 hugin1/hugin/GLPreviewFrame.cpp:1440
-#: hugin1/hugin/MainFrame.cpp:742 hugin1/hugin/MainFrame.cpp:1790
-#: hugin1/hugin/MaskEditorPanel.cpp:448 hugin1/hugin/PreferencesDialog.cpp:934
+#: hugin1/hugin/AssistantPanel.cpp:437
+#: hugin1/hugin/CPDetectorDialog.cpp:121
+#: hugin1/hugin/GLPreviewFrame.cpp:1398
+#: hugin1/hugin/GLPreviewFrame.cpp:1405
+#: hugin1/hugin/GLPreviewFrame.cpp:1412
+#: hugin1/hugin/GLPreviewFrame.cpp:1426
+#: hugin1/hugin/GLPreviewFrame.cpp:1433
+#: hugin1/hugin/GLPreviewFrame.cpp:1440
+#: hugin1/hugin/MainFrame.cpp:742
+#: hugin1/hugin/MainFrame.cpp:1790
+#: hugin1/hugin/MaskEditorPanel.cpp:448
+#: hugin1/hugin/PreferencesDialog.cpp:934
 #: hugin1/ptbatcher/FindPanoDialog.cpp:240
 #: hugin1/ptbatcher/FindPanoDialog.cpp:261
 msgid "Warning"
 msgstr "Advarsel"
 
-#: hugin1/base_wx/LensTools.cpp:37 hugin1/hugin/ImagesList.cpp:608
+#: hugin1/base_wx/LensTools.cpp:37
+#: hugin1/hugin/ImagesList.cpp:608
 msgid "Normal (rectilinear)"
 msgstr "Normal (retliniet)"
 
-#: hugin1/base_wx/LensTools.cpp:38 hugin1/hugin/ImagesList.cpp:609
+#: hugin1/base_wx/LensTools.cpp:38
+#: hugin1/hugin/ImagesList.cpp:609
 msgid "Panoramic (cylindrical)"
 msgstr "Panoramisk (cylindrisk)"
 
-#: hugin1/base_wx/LensTools.cpp:39 hugin1/hugin/ImagesList.cpp:610
+#: hugin1/base_wx/LensTools.cpp:39
+#: hugin1/hugin/ImagesList.cpp:610
 msgid "Circular fisheye"
 msgstr "Cirkulært fiskeøje"
 
-#: hugin1/base_wx/LensTools.cpp:40 hugin1/hugin/ImagesList.cpp:611
+#: hugin1/base_wx/LensTools.cpp:40
+#: hugin1/hugin/ImagesList.cpp:611
 msgid "Full frame fisheye"
 msgstr "Full-frame fiskeøje"
 
-#: hugin1/base_wx/LensTools.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1301
-#: hugin1/hugin/ImagesList.cpp:612 hugin1/hugin/PreviewFrame.cpp:622
+#: hugin1/base_wx/LensTools.cpp:41
+#: hugin1/hugin/GLPreviewFrame.cpp:1301
+#: hugin1/hugin/ImagesList.cpp:612
+#: hugin1/hugin/PreviewFrame.cpp:622
 msgid "Equirectangular"
 msgstr "Ækvirektangulært"
 
-#: hugin1/base_wx/LensTools.cpp:42 hugin1/hugin/ImagesList.cpp:613
+#: hugin1/base_wx/LensTools.cpp:42
+#: hugin1/hugin/ImagesList.cpp:613
 #: hugin1/hugin/PanoPanel.cpp:158
 msgid "Orthographic"
 msgstr "Ortografisk"
 
-#: hugin1/base_wx/LensTools.cpp:43 hugin1/hugin/ImagesList.cpp:614
+#: hugin1/base_wx/LensTools.cpp:43
+#: hugin1/hugin/ImagesList.cpp:614
 #: hugin1/hugin/PanoPanel.cpp:148
 msgid "Stereographic"
 msgstr "Stereografisk"
 
-#: hugin1/base_wx/LensTools.cpp:44 hugin1/hugin/ImagesList.cpp:615
+#: hugin1/base_wx/LensTools.cpp:44
+#: hugin1/hugin/ImagesList.cpp:615
 #: hugin1/hugin/PanoPanel.cpp:159
 msgid "Equisolid"
 msgstr "Ækvisolid"
 
-#: hugin1/base_wx/LensTools.cpp:45 hugin1/hugin/ImagesList.cpp:616
+#: hugin1/base_wx/LensTools.cpp:45
+#: hugin1/hugin/ImagesList.cpp:616
 msgid "Fisheye Thoby"
 msgstr "Fiskeøje-Thoby"
 
@@ -178,13 +220,32 @@
 
 #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:606
 #: hugin1/ptbatcher/RunStitchFrame.cpp:43
-#: hugin1/stitch_project/hugin_stitch_project.cpp:126 translations/xrc.cpp:33
-#: translations/xrc.cpp:162 translations/xrc.cpp:300 translations/xrc.cpp:316
-#: translations/xrc.cpp:323 translations/xrc.cpp:534 translations/xrc.cpp:604
-#: translations/xrc.cpp:608 translations/xrc.cpp:612 translations/xrc.cpp:706
-#: translations/xrc.cpp:853 translations/xrc.cpp:891 translations/xrc.cpp:1054
-#: xrc.cpp:33 xrc.cpp:162 xrc.cpp:300 xrc.cpp:316 xrc.cpp:323 xrc.cpp:534
-#: xrc.cpp:604 xrc.cpp:608 xrc.cpp:612 xrc.cpp:706 xrc.cpp:853 xrc.cpp:891
+#: hugin1/stitch_project/hugin_stitch_project.cpp:126
+#: translations/xrc.cpp:33
+#: translations/xrc.cpp:162
+#: translations/xrc.cpp:300
+#: translations/xrc.cpp:316
+#: translations/xrc.cpp:323
+#: translations/xrc.cpp:534
+#: translations/xrc.cpp:604
+#: translations/xrc.cpp:608
+#: translations/xrc.cpp:612
+#: translations/xrc.cpp:706
+#: translations/xrc.cpp:853
+#: translations/xrc.cpp:891
+#: translations/xrc.cpp:1054
+#: xrc.cpp:33
+#: xrc.cpp:162
+#: xrc.cpp:300
+#: xrc.cpp:316
+#: xrc.cpp:323
+#: xrc.cpp:534
+#: xrc.cpp:604
+#: xrc.cpp:608
+#: xrc.cpp:612
+#: xrc.cpp:706
+#: xrc.cpp:853
+#: xrc.cpp:891
 #: xrc.cpp:1054
 msgid "Cancel"
 msgstr "Annullér"
@@ -202,41 +263,40 @@
 msgstr "Optimerer Panorama"
 
 #: hugin1/base_wx/platform.h:40
-msgid ""
-"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*."
-"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|"
-"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*."
-"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*."
-"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*"
-msgstr ""
-"Alle billedfiler|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*."
-"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|"
-"JPEG-filer (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF-filer (*.tif,*."
-"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG-filer (*.png)|*.png;*.PNG|HDR-filer (*."
-"hdr)|*.hdr;*.HDR|EXR-filer (*.exr)|*.exr;*.EXR|Alle filer (*)|*"
-
-#: hugin1/base_wx/PTWXDlg.cpp:49 hugin1/base_wx/PTWXDlg.cpp:68
-#: hugin1/base_wx/PTWXDlg.cpp:122 translations/xrc.cpp:854 xrc.cpp:854
+msgid "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*"
+msgstr "Alle billedfiler|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG-filer (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF-filer (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG-filer (*.png)|*.png;*.PNG|HDR-filer (*.hdr)|*.hdr;*.HDR|EXR-filer (*.exr)|*.exr;*.EXR|Alle filer (*)|*"
+
+#: hugin1/base_wx/PTWXDlg.cpp:49
+#: hugin1/base_wx/PTWXDlg.cpp:68
+#: hugin1/base_wx/PTWXDlg.cpp:122
+#: translations/xrc.cpp:854
+#: xrc.cpp:854
 msgid "Panorama Tools"
 msgstr "Panorama Tools"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:135 hugin1/base_wx/RunStitchPanel.cpp:304
+#: hugin1/base_wx/RunStitchPanel.cpp:135
+#: hugin1/base_wx/RunStitchPanel.cpp:304
 msgid "Could not open project file:"
 msgstr "Kunne ikke åbne projektfil:"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:145 hugin1/base_wx/RunStitchPanel.cpp:312
-#: hugin1/nona_gui/nona_gui.cpp:243 hugin1/ptbatcher/ProjectArray.cpp:88
+#: hugin1/base_wx/RunStitchPanel.cpp:145
+#: hugin1/base_wx/RunStitchPanel.cpp:312
+#: hugin1/nona_gui/nona_gui.cpp:243
+#: hugin1/ptbatcher/ProjectArray.cpp:88
 #, c-format
 msgid "could not open script : %s"
 msgstr "kunne ikke åbne script: %s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:166 hugin1/base_wx/RunStitchPanel.cpp:320
-#: hugin1/nona_gui/nona_gui.cpp:250 hugin1/ptbatcher/ProjectArray.cpp:115
+#: hugin1/base_wx/RunStitchPanel.cpp:166
+#: hugin1/base_wx/RunStitchPanel.cpp:320
+#: hugin1/nona_gui/nona_gui.cpp:250
+#: hugin1/ptbatcher/ProjectArray.cpp:115
 #, c-format
 msgid "error while parsing panotools script: %s"
 msgstr "fejl under tolkning af panotools script: %s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:227
+#: hugin1/base_wx/RunStitchPanel.cpp:210
+#: hugin1/base_wx/RunStitchPanel.cpp:227
 #: hugin1/base_wx/RunStitchPanel.cpp:346
 msgid "Could not create temporary file"
 msgstr "Kunne ikke oprette midlertidig fil"
@@ -267,7 +327,8 @@
 "Fejl under sammenføjning af projekt\n"
 "%s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:287 hugin1/base_wx/RunStitchPanel.cpp:293
+#: hugin1/base_wx/RunStitchPanel.cpp:287
+#: hugin1/base_wx/RunStitchPanel.cpp:293
 #: hugin1/stitch_project/hugin_stitch_project.cpp:177
 msgid "Error during stitching"
 msgstr "Fejl under sammenføjning"
@@ -281,86 +342,87 @@
 "Fejl under kørsel af assistent\n"
 "%s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:366 hugin1/base_wx/RunStitchPanel.cpp:374
+#: hugin1/base_wx/RunStitchPanel.cpp:366
+#: hugin1/base_wx/RunStitchPanel.cpp:374
 msgid "Error during running assistant"
 msgstr "Fejl under kørsel af assistent"
 
 #: hugin1/base_wx/wxLensDB.cpp:232
-#, fuzzy, c-format
+#, c-format
 msgid "The input \"%s\" is not a valid number."
-msgstr "Input \"%s\" for %s er ikke et gyldigt tal\n"
+msgstr "Input \"%s\" er ikke et gyldigt tal."
 
 #: hugin1/base_wx/wxLensDB.cpp:296
 #, c-format
 msgid "%d lenses found."
-msgstr ""
+msgstr "%d objektiver fundet."
 
 #: hugin1/base_wx/wxLensDB.cpp:300
-#, fuzzy
 msgid "No lens found."
-msgstr "Ingen mulige panoramaer fundet."
+msgstr "Intet objektiv fundet."
 
 #: hugin1/base_wx/wxLensDB.cpp:607
-#, fuzzy
-msgid ""
-"There are too less information for saving data into database. Please check "
-"your input!"
-msgstr ""
-"Der er ugyldige værdier i inputfelterne.\n"
-"Check venligst dine input."
+msgid "There are too less information for saving data into database. Please check your input!"
+msgstr "Der er utilstrækkelig information for at gemme data i databasen. Check venligst dine input!"
 
 #: hugin1/base_wx/wxLensDB.cpp:658
 #, c-format
 msgid ""
 "You selected the folder \"%s\" to save your database file.\n"
-"This is not the default folder. You won't be able to automatically load "
-"these informations back into Hugin.\n"
+"This is not the default folder. You won't be able to automatically load these informations back into Hugin.\n"
 "The default folder for the database files is \"%s\".\n"
 "Do you want to proceed anyway?"
 msgstr ""
+"Du valgte at gemme din databasefil i mappen \"%s\".\n"
+"Dette er ikke standardmappen. Du vil ikke automatisk kunne indlæse disse informationer tilbage til Hugin.\n"
+"Standardmappen for databasefilen er \"%s\".\n"
+"Vil du fortsætte alligevel?"
 
 #: hugin1/base_wx/wxLensDB.cpp:706
-#, fuzzy
 msgid "Save lens into database file"
-msgstr "Gem fil med objektivparametre"
-
-#: hugin1/base_wx/wxLensDB.cpp:708 hugin1/base_wx/wxLensDB.cpp:962
-#, fuzzy
+msgstr "Gem objektiv i databasefil"
+
+#: hugin1/base_wx/wxLensDB.cpp:708
+#: hugin1/base_wx/wxLensDB.cpp:962
 msgid "Lensfun database files (*.xml)|*.xml"
-msgstr "PTmender-filer (*.txt)|*.txt"
-
-#: hugin1/base_wx/wxLensDB.cpp:749 hugin1/base_wx/wxLensDB.cpp:762
-#: hugin1/base_wx/wxLensDB.cpp:808 hugin1/base_wx/wxLensDB.cpp:983
+msgstr "Lensfun databasefiler (*.xml)|*.xml"
+
+#: hugin1/base_wx/wxLensDB.cpp:749
+#: hugin1/base_wx/wxLensDB.cpp:762
+#: hugin1/base_wx/wxLensDB.cpp:808
+#: hugin1/base_wx/wxLensDB.cpp:983
 msgid "Could not save information into database file."
-msgstr ""
+msgstr "Kunne ikke gemme information i databasefilen."
 
 #: hugin1/base_wx/wxLensDB.cpp:815
 msgid "Could not initialize database."
-msgstr ""
+msgstr "Kunne ikke initialisere databasen."
 
 #: hugin1/base_wx/wxLensDB.cpp:819
 #, c-format
 msgid ""
-"The current selected lens does not match with the information of this lens "
-"in the selected database file.\n"
+"The current selected lens does not match with the information of this lens in the selected database file.\n"
 "Could not proceed.\n"
 "(Error code: %d)"
 msgstr ""
+"Det aktuelt valgte objektiv passer ikke overens med informationen om samme objektiv i den valgte databasefil.\n"
+"Kunne ikke fortsætte.\n"
+"(Fejlkode: %d)"
 
 #: hugin1/base_wx/wxLensDB.cpp:931
 msgid "The maker field contains only an empty string."
-msgstr ""
+msgstr "Producent-feltet indeholder kun en tom streng."
 
 #: hugin1/base_wx/wxLensDB.cpp:936
 msgid "The model field contains only an empty string."
-msgstr ""
+msgstr "Model-feltet indeholder kun en tom streng."
 
 #: hugin1/base_wx/wxLensDB.cpp:960
-#, fuzzy
 msgid "Save camera into database file"
-msgstr "Gem objektivparametre til en fil"
-
-#: hugin1/calibrate_lens/LensCalApp.cpp:66 hugin1/hugin/huginApp.cpp:193
+msgstr "Gem kamera i databasefil"
+
+#: hugin1/calibrate_lens/LensCalApp.cpp:66
+#: hugin1/hugin/huginApp.cpp:193
 #: hugin1/ptbatcher/PTBatcherGUI.cpp:80
 msgid "xrc directory not found in bundle"
 msgstr "xrc-mappe blev ikke fundet i programpakke"
@@ -368,28 +430,35 @@
 #: hugin1/calibrate_lens/LensCalApp.cpp:66
 #: hugin1/calibrate_lens/LensCalApp.cpp:74
 #: hugin1/calibrate_lens/LensCalApp.cpp:80
-#: hugin1/calibrate_lens/LensCalApp.cpp:92 hugin1/hugin/huginApp.cpp:193
-#: hugin1/hugin/huginApp.cpp:205 hugin1/hugin/huginApp.cpp:214
-#: hugin1/hugin/huginApp.cpp:228 hugin1/hugin/MainFrame.cpp:2059
-#: hugin1/ptbatcher/PTBatcherGUI.cpp:80 hugin1/ptbatcher/PTBatcherGUI.cpp:91
-#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119
+#: hugin1/calibrate_lens/LensCalApp.cpp:92
+#: hugin1/hugin/huginApp.cpp:193
+#: hugin1/hugin/huginApp.cpp:205
+#: hugin1/hugin/huginApp.cpp:214
+#: hugin1/hugin/huginApp.cpp:228
+#: hugin1/hugin/MainFrame.cpp:2059
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:80
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:91
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:97
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:119

[Hugin-cvs] /hgroot/hugin/hugin: update python api versions (Stefan Peter)

From: <hugin-cvs@li...> - 2012-07-25 12:42

branch:     2012.0
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/0b850e3b1d4e
changeset:  5911:0b850e3b1d4e
user:       harryvanderwolf <hvdwolf@...>
date:       Tue Jul 24 19:53:45 2012 +0200
description:

update python api versions (Stefan Peter)

diffstat:

 src/hugin_script_interface/plugins-dev/dual_use.py        |  2 +-
 src/hugin_script_interface/plugins-dev/plugin_skeleton.py |  2 +-
 src/hugin_script_interface/plugins/crop_cp.py             |  2 +-
 src/hugin_script_interface/plugins/shooting_pattern.py    |  2 +-
 src/hugin_script_interface/plugins/top_five.py            |  2 +-
 src/hugin_script_interface/plugins/woa.py                 |  2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diffs (72 lines):

diff -r 9bc6aa6bc81d -r 0b850e3b1d4e src/hugin_script_interface/plugins-dev/dual_use.py
--- a/src/hugin_script_interface/plugins-dev/dual_use.py	Tue Jul 24 11:24:18 2012 +0200
+++ b/src/hugin_script_interface/plugins-dev/dual_use.py	Tue Jul 24 19:53:45 2012 +0200
@@ -24,7 +24,7 @@
 # @category Examples
 # @name     Dual Use Plugin
 # @api-min  2011.1.0
-# @api-max  2011.5.0
+# @api-max  2012.0.0
 
 # dual_use will function as a hugin plugin and as a standalone
 # Python script.
diff -r 9bc6aa6bc81d -r 0b850e3b1d4e src/hugin_script_interface/plugins-dev/plugin_skeleton.py
--- a/src/hugin_script_interface/plugins-dev/plugin_skeleton.py	Tue Jul 24 11:24:18 2012 +0200
+++ b/src/hugin_script_interface/plugins-dev/plugin_skeleton.py	Tue Jul 24 19:53:45 2012 +0200
@@ -19,7 +19,7 @@
 # @category Examples
 # @name     Skeleton Plugin
 # @api-min  2011.1.0
-# @api-max  2011.5.0
+# @api-max  2012.0.0
 
 # we use modern type python print statements:
 
diff -r 9bc6aa6bc81d -r 0b850e3b1d4e src/hugin_script_interface/plugins/crop_cp.py
--- a/src/hugin_script_interface/plugins/crop_cp.py	Tue Jul 24 11:24:18 2012 +0200
+++ b/src/hugin_script_interface/plugins/crop_cp.py	Tue Jul 24 19:53:45 2012 +0200
@@ -24,7 +24,7 @@
 # @category Control Points
 # @name     Crop Control Points
 # @api-min  2011.1
-# @api-max  2011.5
+# @api-max  2012.0
 
 # crop_cps will function as a hugin plugin and as a standalone
 # Python script. It can also serve as a template for a slightly
diff -r 9bc6aa6bc81d -r 0b850e3b1d4e src/hugin_script_interface/plugins/shooting_pattern.py
--- a/src/hugin_script_interface/plugins/shooting_pattern.py	Tue Jul 24 11:24:18 2012 +0200
+++ b/src/hugin_script_interface/plugins/shooting_pattern.py	Tue Jul 24 19:53:45 2012 +0200
@@ -41,7 +41,7 @@
 # @name     6-1-1 Shooting Pattern
 # @description apply a shooting pattern (6 around, 1 up 1 down)
 # @sys win nix mac
-# @api-max 2011.5.0
+# @api-max 2012.0.0
 # @api-min 2011.1.0
 
 # the position routine will apply yaw, pitch to an image
diff -r 9bc6aa6bc81d -r 0b850e3b1d4e src/hugin_script_interface/plugins/top_five.py
--- a/src/hugin_script_interface/plugins/top_five.py	Tue Jul 24 11:24:18 2012 +0200
+++ b/src/hugin_script_interface/plugins/top_five.py	Tue Jul 24 19:53:45 2012 +0200
@@ -5,7 +5,7 @@
 # @category Control Points
 # @name     keep 5 CPs per image pair
 # @api-min  2011.1
-# @api-max  2011.5
+# @api-max  2012.0
 
 #    top_five.py - keep the five best CPs for each image pair
 
diff -r 9bc6aa6bc81d -r 0b850e3b1d4e src/hugin_script_interface/plugins/woa.py
--- a/src/hugin_script_interface/plugins/woa.py	Tue Jul 24 11:24:18 2012 +0200
+++ b/src/hugin_script_interface/plugins/woa.py	Tue Jul 24 19:53:45 2012 +0200
@@ -25,7 +25,7 @@
 # @category Control Points
 # @name     Warped Overlap Analysis
 # @api-min  2011.1
-# @api-max  2011.5
+# @api-max  2012.0
 
 # note that if you want to read the script, it's written bottom-up, so the
 # higher-level routines are towards the end.

[Hugin-cvs] /hgroot/hugin/hugin: Set default branch to next version level

From: <hugin-cvs@li...> - 2012-07-24 09:17

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/5d5d5fd27e81
changeset:  5908:5d5d5fd27e81
user:       harryvanderwolf <hvdwolf@...>
date:       Tue Jul 24 11:16:57 2012 +0200
description:

Set default branch to next version level

diffstat:

 CMakeLists.txt       |  4 ++--
 mac/Version.xcconfig |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 3322eefa1cda -r 5d5d5fd27e81 CMakeLists.txt
--- a/CMakeLists.txt	Mon Jul 23 22:45:05 2012 +0200
+++ b/CMakeLists.txt	Tue Jul 24 11:16:57 2012 +0200
@@ -39,8 +39,8 @@
 project(hugin)
 
 # version
-set(V_MAJOR 2011)
-set(V_MINOR 5)
+set(V_MAJOR 2012)
+set(V_MINOR 1)
 set(V_PATCH 0)
 
 #
diff -r 3322eefa1cda -r 5d5d5fd27e81 mac/Version.xcconfig
--- a/mac/Version.xcconfig	Mon Jul 23 22:45:05 2012 +0200
+++ b/mac/Version.xcconfig	Tue Jul 24 11:16:57 2012 +0200
@@ -10,8 +10,8 @@
 //overrides above values if checked out from SVN
 #include "../mac/HG-rev.xcconfig"
 
-HUGIN_VERSION_MAJOR = 2011
-HUGIN_VERSION_MINOR = 5
+HUGIN_VERSION_MAJOR = 2012
+HUGIN_VERSION_MINOR = 1
 HUGIN_VERSION_PATCH = 0
 
 HUGIN_PACKAGE_VERSION = $(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).$(HUGIN_VERSION_PATCH)$(HUGIN_PRERELEASE_VERSION_TAG)

[Hugin-cvs] /hgroot/hugin/hugin: Update Dutch translation

From: <hugin-cvs@li...> - 2012-07-24 09:17

branch:     2012.0
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/c020c705dcb2
changeset:  5907:c020c705dcb2
user:       harryvanderwolf <hvdwolf@...>
date:       Tue Jul 24 11:13:28 2012 +0200
description:

Update Dutch translation

diffstat:

 src/translations/nl.po |  5012 ++++++++++++++++++++++++++++-------------------
 1 files changed, 2931 insertions(+), 2081 deletions(-)

diffs (truncated from 8543 to 500 lines):

diff -r 8644d58bc334 -r c020c705dcb2 src/translations/nl.po
--- a/src/translations/nl.po	Mon Jul 23 07:34:31 2012 +0200
+++ b/src/translations/nl.po	Tue Jul 24 11:13:28 2012 +0200
@@ -9,8 +9,8 @@
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
 "POT-Creation-Date: 2012-07-23 06:47+0200\n"
-"PO-Revision-Date: 2012-01-17 17:30+0100\n"
-"Last-Translator: Harry van der Wolf <harryvanderwolf@..."
+"PO-Revision-Date: 2012-07-24 11:02+0100\n"
+"Last-Translator: Harry van der Wolf <hvdwolf@..."
 "Language-Team: American English <kde-i18n-doc@..."
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -21,72 +21,99 @@
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82
+#: hugin1/base_wx/huginConfig.cpp:47
+#: hugin1/base_wx/huginConfig.cpp:82
 #, c-format
-msgid ""
-"External program %s not found as specified in preferences, reverting to "
-"bundled version"
-msgstr ""
-"Extern programma %s niet gevonden zoals aangegeven in de Voorkeuren, verder "
-"met de gebundelde versie"
-
-#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:57
-#: hugin1/base_wx/huginConfig.cpp:69 hugin1/base_wx/huginConfig.cpp:82
-#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/RunStitchPanel.cpp:111
-#: hugin1/base_wx/wxLensDB.cpp:749 hugin1/base_wx/wxLensDB.cpp:762
-#: hugin1/base_wx/wxLensDB.cpp:808 hugin1/base_wx/wxLensDB.cpp:815
-#: hugin1/base_wx/wxLensDB.cpp:820 hugin1/base_wx/wxLensDB.cpp:983
+msgid "External program %s not found as specified in preferences, reverting to bundled version"
+msgstr "Extern programma %s niet gevonden zoals aangegeven in de Voorkeuren, verder met de gebundelde versie"
+
+#: hugin1/base_wx/huginConfig.cpp:47
+#: hugin1/base_wx/huginConfig.cpp:57
+#: hugin1/base_wx/huginConfig.cpp:69
+#: hugin1/base_wx/huginConfig.cpp:82
+#: hugin1/base_wx/platform.cpp:125
+#: hugin1/base_wx/RunStitchPanel.cpp:111
+#: hugin1/base_wx/wxLensDB.cpp:749
+#: hugin1/base_wx/wxLensDB.cpp:762
+#: hugin1/base_wx/wxLensDB.cpp:808
+#: hugin1/base_wx/wxLensDB.cpp:815
+#: hugin1/base_wx/wxLensDB.cpp:820
+#: hugin1/base_wx/wxLensDB.cpp:983
 #: hugin1/calibrate_lens/LensCalFrame.cpp:101
 #: hugin1/calibrate_lens/LensCalFrame.cpp:402
 #: hugin1/calibrate_lens/LensCalFrame.cpp:466
-#: hugin1/hugin/AssistantPanel.cpp:365 hugin1/hugin/AssistantPanel.cpp:433
-#: hugin1/hugin/AssistantPanel.cpp:481 hugin1/hugin/AssistantPanel.cpp:491
-#: hugin1/hugin/AssistantPanel.cpp:503 hugin1/hugin/AssistantPanel.cpp:509
-#: hugin1/hugin/CPEditorPanel.cpp:1783 hugin1/hugin/GLViewer.cpp:153
-#: hugin1/hugin/GLViewer.cpp:163 hugin1/hugin/LensPanel.cpp:843
-#: hugin1/hugin/MainFrame.cpp:185 hugin1/hugin/MainFrame.cpp:746
-#: hugin1/hugin/MainFrame.cpp:1026 hugin1/hugin/MainFrame.cpp:1567
+#: hugin1/hugin/AssistantPanel.cpp:365
+#: hugin1/hugin/AssistantPanel.cpp:433
+#: hugin1/hugin/AssistantPanel.cpp:481
+#: hugin1/hugin/AssistantPanel.cpp:491
+#: hugin1/hugin/AssistantPanel.cpp:503
+#: hugin1/hugin/AssistantPanel.cpp:509
+#: hugin1/hugin/CPEditorPanel.cpp:1783
+#: hugin1/hugin/GLViewer.cpp:153
+#: hugin1/hugin/GLViewer.cpp:163
+#: hugin1/hugin/LensPanel.cpp:843
+#: hugin1/hugin/MainFrame.cpp:185
+#: hugin1/hugin/MainFrame.cpp:746
+#: hugin1/hugin/MainFrame.cpp:1026
+#: hugin1/hugin/MainFrame.cpp:1567
 #: hugin1/hugin/MainFrame.cpp:2064
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:565
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:585
-#: hugin1/hugin/PanoPanel.cpp:997 hugin1/hugin/PanoPanel.cpp:1060
-#: hugin1/hugin/PanoPanel.cpp:1188 hugin1/hugin/PanoPanel.cpp:1206
+#: hugin1/hugin/PanoPanel.cpp:997
+#: hugin1/hugin/PanoPanel.cpp:1060
+#: hugin1/hugin/PanoPanel.cpp:1188
+#: hugin1/hugin/PanoPanel.cpp:1206
 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:246
-#: hugin1/ptbatcher/BatchFrame.cpp:455 hugin1/ptbatcher/FindPanoDialog.cpp:283
+#: hugin1/ptbatcher/BatchFrame.cpp:455
+#: hugin1/ptbatcher/FindPanoDialog.cpp:283
 #: hugin1/ptbatcher/ProjectListBox.cpp:169
 #: hugin1/stitch_project/hugin_stitch_project.cpp:411
 msgid "Error"
 msgstr "Fout"
 
-#: hugin1/base_wx/huginConfig.cpp:57 hugin1/base_wx/huginConfig.cpp:69
-#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/RunStitchPanel.cpp:111
-#: hugin1/hugin/AssistantPanel.cpp:481 hugin1/hugin/PanoPanel.cpp:1206
+#: hugin1/base_wx/huginConfig.cpp:57
+#: hugin1/base_wx/huginConfig.cpp:69
+#: hugin1/base_wx/platform.cpp:125
+#: hugin1/base_wx/RunStitchPanel.cpp:111
+#: hugin1/hugin/AssistantPanel.cpp:481
+#: hugin1/hugin/PanoPanel.cpp:1206
 #, c-format
 msgid "External program %s not found in the bundle, reverting to system path"
-msgstr ""
-"Extern programma %s niet gevonden in de bundel, het systeempad wordt gebruikt"
+msgstr "Extern programma %s niet gevonden in de bundel, het systeempad wordt gebruikt"
 
 # hugin1/base_wx/huginConfig.cpp:95 hugin1/base_wx/huginConfig.cpp:109, c-format
-#: hugin1/base_wx/huginConfig.cpp:95 hugin1/base_wx/huginConfig.cpp:109
+#: hugin1/base_wx/huginConfig.cpp:95
+#: hugin1/base_wx/huginConfig.cpp:109
 #, c-format
 msgid "Program %s not found in preferences, reverting to default value"
-msgstr ""
-"Programma %s niet gevonden in de voorkeuren, verder met de "
-"standaardinstelling"
-
-#: hugin1/base_wx/huginConfig.cpp:129 hugin1/base_wx/huginConfig.cpp:134
-#: hugin1/base_wx/huginConfig.cpp:140 hugin1/base_wx/huginConfig.cpp:145
-#: hugin1/base_wx/huginConfig.cpp:150 hugin1/base_wx/huginConfig.cpp:155
-#: hugin1/base_wx/huginConfig.cpp:161 hugin1/base_wx/huginConfig.cpp:166
-#: hugin1/base_wx/huginConfig.cpp:171 hugin1/base_wx/huginConfig.cpp:176
-#: hugin1/base_wx/huginConfig.cpp:182 hugin1/base_wx/huginConfig.cpp:187
-#: hugin1/base_wx/huginConfig.cpp:194 hugin1/base_wx/huginConfig.cpp:199
-#: hugin1/base_wx/huginConfig.cpp:219 hugin1/base_wx/huginConfig.cpp:224
-#: hugin1/base_wx/huginConfig.cpp:230 hugin1/base_wx/huginConfig.cpp:235
-#: hugin1/base_wx/huginConfig.cpp:240 hugin1/base_wx/huginConfig.cpp:245
-#: hugin1/base_wx/huginConfig.cpp:253 hugin1/base_wx/wxLensDB.cpp:232
-#: hugin1/base_wx/wxLensDB.cpp:607 hugin1/base_wx/wxLensDB.cpp:659
-#: hugin1/base_wx/wxLensDB.cpp:931 hugin1/base_wx/wxLensDB.cpp:936
+msgstr "Programma %s niet gevonden in de voorkeuren, verder met de standaardinstelling"
+
+#: hugin1/base_wx/huginConfig.cpp:129
+#: hugin1/base_wx/huginConfig.cpp:134
+#: hugin1/base_wx/huginConfig.cpp:140
+#: hugin1/base_wx/huginConfig.cpp:145
+#: hugin1/base_wx/huginConfig.cpp:150
+#: hugin1/base_wx/huginConfig.cpp:155
+#: hugin1/base_wx/huginConfig.cpp:161
+#: hugin1/base_wx/huginConfig.cpp:166
+#: hugin1/base_wx/huginConfig.cpp:171
+#: hugin1/base_wx/huginConfig.cpp:176
+#: hugin1/base_wx/huginConfig.cpp:182
+#: hugin1/base_wx/huginConfig.cpp:187
+#: hugin1/base_wx/huginConfig.cpp:194
+#: hugin1/base_wx/huginConfig.cpp:199
+#: hugin1/base_wx/huginConfig.cpp:219
+#: hugin1/base_wx/huginConfig.cpp:224
+#: hugin1/base_wx/huginConfig.cpp:230
+#: hugin1/base_wx/huginConfig.cpp:235
+#: hugin1/base_wx/huginConfig.cpp:240
+#: hugin1/base_wx/huginConfig.cpp:245
+#: hugin1/base_wx/huginConfig.cpp:253
+#: hugin1/base_wx/wxLensDB.cpp:232
+#: hugin1/base_wx/wxLensDB.cpp:607
+#: hugin1/base_wx/wxLensDB.cpp:659
+#: hugin1/base_wx/wxLensDB.cpp:931
+#: hugin1/base_wx/wxLensDB.cpp:936
 #: hugin1/calibrate_lens/LensCalFrame.cpp:415
 #: hugin1/calibrate_lens/LensCalFrame.cpp:594
 #: hugin1/calibrate_lens/LensCalFrame.cpp:617
@@ -95,54 +122,70 @@
 #: hugin1/calibrate_lens/LensCalFrame.cpp:768
 #: hugin1/calibrate_lens/LensCalFrame.cpp:794
 #: hugin1/calibrate_lens/LensCalFrame.cpp:866
-#: hugin1/hugin/AssistantPanel.cpp:437 hugin1/hugin/CPDetectorDialog.cpp:121
-#: hugin1/hugin/GLPreviewFrame.cpp:1398 hugin1/hugin/GLPreviewFrame.cpp:1405
-#: hugin1/hugin/GLPreviewFrame.cpp:1412 hugin1/hugin/GLPreviewFrame.cpp:1426
-#: hugin1/hugin/GLPreviewFrame.cpp:1433 hugin1/hugin/GLPreviewFrame.cpp:1440
-#: hugin1/hugin/MainFrame.cpp:742 hugin1/hugin/MainFrame.cpp:1790
-#: hugin1/hugin/MaskEditorPanel.cpp:448 hugin1/hugin/PreferencesDialog.cpp:934
+#: hugin1/hugin/AssistantPanel.cpp:437
+#: hugin1/hugin/CPDetectorDialog.cpp:121
+#: hugin1/hugin/GLPreviewFrame.cpp:1398
+#: hugin1/hugin/GLPreviewFrame.cpp:1405
+#: hugin1/hugin/GLPreviewFrame.cpp:1412
+#: hugin1/hugin/GLPreviewFrame.cpp:1426
+#: hugin1/hugin/GLPreviewFrame.cpp:1433
+#: hugin1/hugin/GLPreviewFrame.cpp:1440
+#: hugin1/hugin/MainFrame.cpp:742
+#: hugin1/hugin/MainFrame.cpp:1790
+#: hugin1/hugin/MaskEditorPanel.cpp:448
+#: hugin1/hugin/PreferencesDialog.cpp:934
 #: hugin1/ptbatcher/FindPanoDialog.cpp:240
 #: hugin1/ptbatcher/FindPanoDialog.cpp:261
 msgid "Warning"
 msgstr "Attentie"
 
-#: hugin1/base_wx/LensTools.cpp:37 hugin1/hugin/ImagesList.cpp:608
+#: hugin1/base_wx/LensTools.cpp:37
+#: hugin1/hugin/ImagesList.cpp:608
 msgid "Normal (rectilinear)"
 msgstr "Normaal (rectilinear)"
 
-#: hugin1/base_wx/LensTools.cpp:38 hugin1/hugin/ImagesList.cpp:609
+#: hugin1/base_wx/LensTools.cpp:38
+#: hugin1/hugin/ImagesList.cpp:609
 msgid "Panoramic (cylindrical)"
 msgstr "Panoramisch (cylindrisch)"
 
-#: hugin1/base_wx/LensTools.cpp:39 hugin1/hugin/ImagesList.cpp:610
+#: hugin1/base_wx/LensTools.cpp:39
+#: hugin1/hugin/ImagesList.cpp:610
 msgid "Circular fisheye"
 msgstr "Cirkelvormig fisheye"
 
-#: hugin1/base_wx/LensTools.cpp:40 hugin1/hugin/ImagesList.cpp:611
+#: hugin1/base_wx/LensTools.cpp:40
+#: hugin1/hugin/ImagesList.cpp:611
 msgid "Full frame fisheye"
 msgstr "Volledig frame fisheye"
 
-#: hugin1/base_wx/LensTools.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1301
-#: hugin1/hugin/ImagesList.cpp:612 hugin1/hugin/PreviewFrame.cpp:622
+#: hugin1/base_wx/LensTools.cpp:41
+#: hugin1/hugin/GLPreviewFrame.cpp:1301
+#: hugin1/hugin/ImagesList.cpp:612
+#: hugin1/hugin/PreviewFrame.cpp:622
 msgid "Equirectangular"
 msgstr "Equirectangulair"
 
-#: hugin1/base_wx/LensTools.cpp:42 hugin1/hugin/ImagesList.cpp:613
+#: hugin1/base_wx/LensTools.cpp:42
+#: hugin1/hugin/ImagesList.cpp:613
 #: hugin1/hugin/PanoPanel.cpp:158
 msgid "Orthographic"
 msgstr "Orthographic"
 
-#: hugin1/base_wx/LensTools.cpp:43 hugin1/hugin/ImagesList.cpp:614
+#: hugin1/base_wx/LensTools.cpp:43
+#: hugin1/hugin/ImagesList.cpp:614
 #: hugin1/hugin/PanoPanel.cpp:148
 msgid "Stereographic"
 msgstr "Stereographisch"
 
-#: hugin1/base_wx/LensTools.cpp:44 hugin1/hugin/ImagesList.cpp:615
+#: hugin1/base_wx/LensTools.cpp:44
+#: hugin1/hugin/ImagesList.cpp:615
 #: hugin1/hugin/PanoPanel.cpp:159
 msgid "Equisolid"
 msgstr "Equisolid"
 
-#: hugin1/base_wx/LensTools.cpp:45 hugin1/hugin/ImagesList.cpp:616
+#: hugin1/base_wx/LensTools.cpp:45
+#: hugin1/hugin/ImagesList.cpp:616
 msgid "Fisheye Thoby"
 msgstr "Fisheye Thoby"
 
@@ -159,8 +202,7 @@
 "Incompatible lens parameter file, image sizes do not match\n"
 "Apply settings anyway?"
 msgstr ""
-"Niet compatibel lensparameterbestand, afbeeldingsgroottes komen niet "
-"overeen\n"
+"Niet compatibel lensparameterbestand, afbeeldingsgroottes komen niet overeen\n"
 "Instellingen toch toepassen?"
 
 #: hugin1/base_wx/LensTools.cpp:242
@@ -176,23 +218,42 @@
 #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:179
 #, c-format
 msgid "Error pausing process %ld, code 1"
-msgstr "Fout bij pauzeren proces %ld, code 1"
+msgstr "Fout, pauzeren bij proces %ld, code 1"
 
 # hugin1/base_wx/MyExternalCmdExecDialog.cpp:196, c-format
 #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:196
 #, c-format
 msgid "Error pausing process %ld, code 2"
-msgstr "Fout bij pauzeren proces %ld, code 2"
+msgstr "Fout, pauzeren bij proces %ld, code 2"
 
 #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:606
 #: hugin1/ptbatcher/RunStitchFrame.cpp:43
-#: hugin1/stitch_project/hugin_stitch_project.cpp:126 translations/xrc.cpp:33
-#: translations/xrc.cpp:162 translations/xrc.cpp:300 translations/xrc.cpp:316
-#: translations/xrc.cpp:323 translations/xrc.cpp:534 translations/xrc.cpp:604
-#: translations/xrc.cpp:608 translations/xrc.cpp:612 translations/xrc.cpp:706
-#: translations/xrc.cpp:853 translations/xrc.cpp:891 translations/xrc.cpp:1054
-#: xrc.cpp:33 xrc.cpp:162 xrc.cpp:300 xrc.cpp:316 xrc.cpp:323 xrc.cpp:534
-#: xrc.cpp:604 xrc.cpp:608 xrc.cpp:612 xrc.cpp:706 xrc.cpp:853 xrc.cpp:891
+#: hugin1/stitch_project/hugin_stitch_project.cpp:126
+#: translations/xrc.cpp:33
+#: translations/xrc.cpp:162
+#: translations/xrc.cpp:300
+#: translations/xrc.cpp:316
+#: translations/xrc.cpp:323
+#: translations/xrc.cpp:534
+#: translations/xrc.cpp:604
+#: translations/xrc.cpp:608
+#: translations/xrc.cpp:612
+#: translations/xrc.cpp:706
+#: translations/xrc.cpp:853
+#: translations/xrc.cpp:891
+#: translations/xrc.cpp:1054
+#: xrc.cpp:33
+#: xrc.cpp:162
+#: xrc.cpp:300
+#: xrc.cpp:316
+#: xrc.cpp:323
+#: xrc.cpp:534
+#: xrc.cpp:604
+#: xrc.cpp:608
+#: xrc.cpp:612
+#: xrc.cpp:706
+#: xrc.cpp:853
+#: xrc.cpp:891
 #: xrc.cpp:1054
 msgid "Cancel"
 msgstr "Annuleer"
@@ -210,42 +271,40 @@
 msgstr "Optimaliseren Panorama"
 
 #: hugin1/base_wx/platform.h:40
-msgid ""
-"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*."
-"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|"
-"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*."
-"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*."
-"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*"
-msgstr ""
-"Alle afbeeldingsbestanden|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;"
-"*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*."
-"exr;*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*."
-"tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG bestanden (*.png)|*.png;*.PNG|HDR "
-"bestanden (*.hdr)|*.hdr;*.HDR|EXR bestanden (*.exr)|*.exr;*.EXR|All "
-"bestanden (*)|*"
-
-#: hugin1/base_wx/PTWXDlg.cpp:49 hugin1/base_wx/PTWXDlg.cpp:68
-#: hugin1/base_wx/PTWXDlg.cpp:122 translations/xrc.cpp:854 xrc.cpp:854
+msgid "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*"
+msgstr "Alle afbeeldingsbestanden|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG bestanden (*.png)|*.png;*.PNG|HDR bestanden (*.hdr)|*.hdr;*.HDR|EXR bestanden (*.exr)|*.exr;*.EXR|All bestanden (*)|*"
+
+#: hugin1/base_wx/PTWXDlg.cpp:49
+#: hugin1/base_wx/PTWXDlg.cpp:68
+#: hugin1/base_wx/PTWXDlg.cpp:122
+#: translations/xrc.cpp:854
+#: xrc.cpp:854
 msgid "Panorama Tools"
 msgstr "Panorama Tools"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:135 hugin1/base_wx/RunStitchPanel.cpp:304
+#: hugin1/base_wx/RunStitchPanel.cpp:135
+#: hugin1/base_wx/RunStitchPanel.cpp:304
 msgid "Could not open project file:"
 msgstr "Kan projectbestand niet openen:"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:145 hugin1/base_wx/RunStitchPanel.cpp:312
-#: hugin1/nona_gui/nona_gui.cpp:243 hugin1/ptbatcher/ProjectArray.cpp:88
+#: hugin1/base_wx/RunStitchPanel.cpp:145
+#: hugin1/base_wx/RunStitchPanel.cpp:312
+#: hugin1/nona_gui/nona_gui.cpp:243
+#: hugin1/ptbatcher/ProjectArray.cpp:88
 #, c-format
 msgid "could not open script : %s"
 msgstr "Kan script: %s  niet openen"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:166 hugin1/base_wx/RunStitchPanel.cpp:320
-#: hugin1/nona_gui/nona_gui.cpp:250 hugin1/ptbatcher/ProjectArray.cpp:115
+#: hugin1/base_wx/RunStitchPanel.cpp:166
+#: hugin1/base_wx/RunStitchPanel.cpp:320
+#: hugin1/nona_gui/nona_gui.cpp:250
+#: hugin1/ptbatcher/ProjectArray.cpp:115
 #, c-format
 msgid "error while parsing panotools script: %s"
 msgstr "fout bij verwerking panotoolsscript: %s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:227
+#: hugin1/base_wx/RunStitchPanel.cpp:210
+#: hugin1/base_wx/RunStitchPanel.cpp:227
 #: hugin1/base_wx/RunStitchPanel.cpp:346
 msgid "Could not create temporary file"
 msgstr "Kan tijdelijk bestand niet aanmaken"
@@ -276,7 +335,8 @@
 "Fout bij uitvoeren project\n"
 "%s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:287 hugin1/base_wx/RunStitchPanel.cpp:293
+#: hugin1/base_wx/RunStitchPanel.cpp:287
+#: hugin1/base_wx/RunStitchPanel.cpp:293
 #: hugin1/stitch_project/hugin_stitch_project.cpp:177
 msgid "Error during stitching"
 msgstr "Fout bij samenvoegen"
@@ -290,86 +350,87 @@
 "Fout bij uitvoeren van de Assistent\n"
 "%s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:366 hugin1/base_wx/RunStitchPanel.cpp:374
+#: hugin1/base_wx/RunStitchPanel.cpp:366
+#: hugin1/base_wx/RunStitchPanel.cpp:374
 msgid "Error during running assistant"
 msgstr "Fout tijdens uitvoeren Assistent"
 
 #: hugin1/base_wx/wxLensDB.cpp:232
-#, fuzzy, c-format
+#, c-format
 msgid "The input \"%s\" is not a valid number."
-msgstr "Invoer  \"%s\" voor %s is geen geldig getal\n"
+msgstr "Invoer  \"%s\" is geen geldig getal."
 
 #: hugin1/base_wx/wxLensDB.cpp:296
 #, c-format
 msgid "%d lenses found."
-msgstr ""
+msgstr "%d lenzen gevonden."
 
 #: hugin1/base_wx/wxLensDB.cpp:300
-#, fuzzy
 msgid "No lens found."
-msgstr "Geen mogelijke panoramas gevonden"
+msgstr "Geen lens gevonden."
 
 #: hugin1/base_wx/wxLensDB.cpp:607
-#, fuzzy
-msgid ""
-"There are too less information for saving data into database. Please check "
-"your input!"
-msgstr ""
-"Incorrecte waarden in de invoer velden.\n"
-"Controleer uw invoer."
+msgid "There are too less information for saving data into database. Please check your input!"
+msgstr "Er is te weinig informatie om op te kunnen slaan in de database. Controleer de ingegeven waarden!"
 
 #: hugin1/base_wx/wxLensDB.cpp:658
 #, c-format
 msgid ""
 "You selected the folder \"%s\" to save your database file.\n"
-"This is not the default folder. You won't be able to automatically load "
-"these informations back into Hugin.\n"
+"This is not the default folder. You won't be able to automatically load these informations back into Hugin.\n"
 "The default folder for the database files is \"%s\".\n"
 "Do you want to proceed anyway?"
 msgstr ""
+"Je selecteerde de folder \"%s\" om je database bestand op te slaan.\n"
+"Dit is niet de standaard folder. Het is niet mogelijk deze informatie automatisch weer in te lezen in Hugin.\n"
+"De standaard database folder is \"%s\".\n"
+"Wil je toch verder gaan?"
 
 #: hugin1/base_wx/wxLensDB.cpp:706
-#, fuzzy
 msgid "Save lens into database file"
-msgstr "Opslaan lensparametersbestand"
-
-#: hugin1/base_wx/wxLensDB.cpp:708 hugin1/base_wx/wxLensDB.cpp:962
-#, fuzzy
+msgstr "Opslaan lens in het database bestand"
+
+#: hugin1/base_wx/wxLensDB.cpp:708
+#: hugin1/base_wx/wxLensDB.cpp:962
 msgid "Lensfun database files (*.xml)|*.xml"
-msgstr "PTMender bestanden (*.txt)|*.txt"
-
-#: hugin1/base_wx/wxLensDB.cpp:749 hugin1/base_wx/wxLensDB.cpp:762
-#: hugin1/base_wx/wxLensDB.cpp:808 hugin1/base_wx/wxLensDB.cpp:983
+msgstr "Lensfun database bestanden (*.xml)|*.xml"
+
+#: hugin1/base_wx/wxLensDB.cpp:749
+#: hugin1/base_wx/wxLensDB.cpp:762
+#: hugin1/base_wx/wxLensDB.cpp:808
+#: hugin1/base_wx/wxLensDB.cpp:983
 msgid "Could not save information into database file."
-msgstr ""
+msgstr "Kon de informatie niet opslaan in het database bestand."
 
 #: hugin1/base_wx/wxLensDB.cpp:815
 msgid "Could not initialize database."
-msgstr ""
+msgstr "Kon de database niet initialiseren."
 
 #: hugin1/base_wx/wxLensDB.cpp:819
 #, c-format
 msgid ""
-"The current selected lens does not match with the information of this lens "
-"in the selected database file.\n"
+"The current selected lens does not match with the information of this lens in the selected database file.\n"
 "Could not proceed.\n"
 "(Error code: %d)"
 msgstr ""
+"De huidige geselecteerde lens komt niet overeen met de informatie van deze lens in het geselecteerde database bestand.\n"
+"Kan niet verder gaan.\n"
+"(Fout melding: %d)"
 
 #: hugin1/base_wx/wxLensDB.cpp:931
 msgid "The maker field contains only an empty string."
-msgstr ""
+msgstr "Het maker veld bevat een lege regel."
 
 #: hugin1/base_wx/wxLensDB.cpp:936
 msgid "The model field contains only an empty string."
-msgstr ""
+msgstr "Het model veld bevat een lege regel."
 
 #: hugin1/base_wx/wxLensDB.cpp:960
-#, fuzzy
 msgid "Save camera into database file"
-msgstr "Lensparameters opslaan in een bestand"
-
-#: hugin1/calibrate_lens/LensCalApp.cpp:66 hugin1/hugin/huginApp.cpp:193
+msgstr "Camera opslaan in het database bestand"
+

[Hugin-cvs] /hgroot/hugin/hugin: Added tag 2012.0beta1 for changeset 7745504...

From: <hugin-cvs@li...> - 2012-07-24 09:17

branch:     2012.0
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/8644d58bc334
changeset:  5906:8644d58bc334
user:       harryvanderwolf <hvdwolf@...>
date:       Mon Jul 23 07:34:31 2012 +0200
description:

Added tag 2012.0beta1 for changeset 774550436f28

diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 774550436f28 -r 8644d58bc334 .hgtags
--- a/.hgtags	Mon Jul 23 07:26:54 2012 +0200
+++ b/.hgtags	Mon Jul 23 07:34:31 2012 +0200
@@ -70,3 +70,4 @@
 4ddbc0de5115b7ac2010f34d0e2ee3530234862e 2011.4beta1
 cf9be93443565d15a336f3e2f3959877caba8dea 2011.4.0_rc1
 cf9be93443565d15a336f3e2f3959877caba8dea 2011.4.0
+774550436f28d19f205443be210a0bea4cc4082e 2012.0beta1

[Hugin-cvs] /hgroot/hugin/hugin: Link to flann_cpp when using an external fl...

From: <hugin-cvs@li...> - 2012-07-23 20:49

branch:     gui_overhaul
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/6ea1e7f7afdf
changeset:  5905:6ea1e7f7afdf
user:       Bruno Postle <bruno@...>
date:       Mon Jul 23 21:54:35 2012 +0100
description:

Link to flann_cpp when using an external flann library.  It isn't
necessary for flann-1.7.1 where just headers are required, but we
do it anyway for earlier versions of flann.

diffstat:

 src/hugin_cpfind/cpfind/CMakeLists.txt |  4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (15 lines):

diff -r 8b35de1371b0 -r 6ea1e7f7afdf src/hugin_cpfind/cpfind/CMakeLists.txt
--- a/src/hugin_cpfind/cpfind/CMakeLists.txt	Mon Jul 23 19:19:58 2012 +0200
+++ b/src/hugin_cpfind/cpfind/CMakeLists.txt	Mon Jul 23 21:54:35 2012 +0100
@@ -5,7 +5,11 @@
 IF(WIN32)
 	target_link_libraries(cpfind localfeatures ${ZTHREAD_LIBRARIES} ${image_libs} ${common_libs} celeste)
 ELSE(WIN32)
+IF(FLANN_FOUND)
+        target_link_libraries(cpfind localfeatures ${ZTHREAD_LIBRARIES} pthread ${image_libs} ${common_libs} celeste ${FLANN_LIBRARIES})
+ELSE(FLANN_FOUND)
 	target_link_libraries(cpfind localfeatures ${ZTHREAD_LIBRARIES} pthread ${image_libs} ${common_libs} celeste)
+ENDIF(FLANN_FOUND)
 ENDIF(WIN32)
 
 install(TARGETS cpfind DESTINATION ${BINDIR})

[Hugin-cvs] /hgroot/hugin/hugin: updated Danish translation

From: <hugin-cvs@li...> - 2012-07-23 20:46

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/3322eefa1cda
changeset:  5904:3322eefa1cda
user:       Thomas Pryds <thomas@...>
date:       Mon Jul 23 22:45:05 2012 +0200
description:

updated Danish translation

diffstat:

 src/translations/da.po |  4821 ++++++++++++++++++++++++++++-------------------
 1 files changed, 2899 insertions(+), 1922 deletions(-)

diffs (truncated from 8051 to 500 lines):

diff -r 2d29fbedc166 -r 3322eefa1cda src/translations/da.po
--- a/src/translations/da.po	Mon Jul 23 06:54:53 2012 +0200
+++ b/src/translations/da.po	Mon Jul 23 22:45:05 2012 +0200
@@ -8,7 +8,7 @@
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
 "POT-Creation-Date: 2012-07-23 06:47+0200\n"
-"PO-Revision-Date: 2012-05-08 10:33+0100\n"
+"PO-Revision-Date: 2012-07-23 22:36+0100\n"
 "Last-Translator: Thomas Pryds <thomas@..."
 "Language-Team: danish <da@..."
 "Language: \n"
@@ -16,72 +16,98 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82
+#: hugin1/base_wx/huginConfig.cpp:47
+#: hugin1/base_wx/huginConfig.cpp:82
 #, c-format
-msgid ""
-"External program %s not found as specified in preferences, reverting to "
-"bundled version"
-msgstr ""
-"Eksternt program %s blev ikke fundet som angivet i indstillingerne; bruger i "
-"stedet versionen i programpakken"
-
-#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:57
-#: hugin1/base_wx/huginConfig.cpp:69 hugin1/base_wx/huginConfig.cpp:82
-#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/RunStitchPanel.cpp:111
-#: hugin1/base_wx/wxLensDB.cpp:749 hugin1/base_wx/wxLensDB.cpp:762
-#: hugin1/base_wx/wxLensDB.cpp:808 hugin1/base_wx/wxLensDB.cpp:815
-#: hugin1/base_wx/wxLensDB.cpp:820 hugin1/base_wx/wxLensDB.cpp:983
+msgid "External program %s not found as specified in preferences, reverting to bundled version"
+msgstr "Eksternt program %s blev ikke fundet som angivet i indstillingerne; bruger i stedet versionen i programpakken"
+
+#: hugin1/base_wx/huginConfig.cpp:47
+#: hugin1/base_wx/huginConfig.cpp:57
+#: hugin1/base_wx/huginConfig.cpp:69
+#: hugin1/base_wx/huginConfig.cpp:82
+#: hugin1/base_wx/platform.cpp:125
+#: hugin1/base_wx/RunStitchPanel.cpp:111
+#: hugin1/base_wx/wxLensDB.cpp:749
+#: hugin1/base_wx/wxLensDB.cpp:762
+#: hugin1/base_wx/wxLensDB.cpp:808
+#: hugin1/base_wx/wxLensDB.cpp:815
+#: hugin1/base_wx/wxLensDB.cpp:820
+#: hugin1/base_wx/wxLensDB.cpp:983
 #: hugin1/calibrate_lens/LensCalFrame.cpp:101
 #: hugin1/calibrate_lens/LensCalFrame.cpp:402
 #: hugin1/calibrate_lens/LensCalFrame.cpp:466
-#: hugin1/hugin/AssistantPanel.cpp:365 hugin1/hugin/AssistantPanel.cpp:433
-#: hugin1/hugin/AssistantPanel.cpp:481 hugin1/hugin/AssistantPanel.cpp:491
-#: hugin1/hugin/AssistantPanel.cpp:503 hugin1/hugin/AssistantPanel.cpp:509
-#: hugin1/hugin/CPEditorPanel.cpp:1783 hugin1/hugin/GLViewer.cpp:153
-#: hugin1/hugin/GLViewer.cpp:163 hugin1/hugin/LensPanel.cpp:843
-#: hugin1/hugin/MainFrame.cpp:185 hugin1/hugin/MainFrame.cpp:746
-#: hugin1/hugin/MainFrame.cpp:1026 hugin1/hugin/MainFrame.cpp:1567
+#: hugin1/hugin/AssistantPanel.cpp:365
+#: hugin1/hugin/AssistantPanel.cpp:433
+#: hugin1/hugin/AssistantPanel.cpp:481
+#: hugin1/hugin/AssistantPanel.cpp:491
+#: hugin1/hugin/AssistantPanel.cpp:503
+#: hugin1/hugin/AssistantPanel.cpp:509
+#: hugin1/hugin/CPEditorPanel.cpp:1783
+#: hugin1/hugin/GLViewer.cpp:153
+#: hugin1/hugin/GLViewer.cpp:163
+#: hugin1/hugin/LensPanel.cpp:843
+#: hugin1/hugin/MainFrame.cpp:185
+#: hugin1/hugin/MainFrame.cpp:746
+#: hugin1/hugin/MainFrame.cpp:1026
+#: hugin1/hugin/MainFrame.cpp:1567
 #: hugin1/hugin/MainFrame.cpp:2064
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:565
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:585
-#: hugin1/hugin/PanoPanel.cpp:997 hugin1/hugin/PanoPanel.cpp:1060
-#: hugin1/hugin/PanoPanel.cpp:1188 hugin1/hugin/PanoPanel.cpp:1206
+#: hugin1/hugin/PanoPanel.cpp:997
+#: hugin1/hugin/PanoPanel.cpp:1060
+#: hugin1/hugin/PanoPanel.cpp:1188
+#: hugin1/hugin/PanoPanel.cpp:1206
 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:246
-#: hugin1/ptbatcher/BatchFrame.cpp:455 hugin1/ptbatcher/FindPanoDialog.cpp:283
+#: hugin1/ptbatcher/BatchFrame.cpp:455
+#: hugin1/ptbatcher/FindPanoDialog.cpp:283
 #: hugin1/ptbatcher/ProjectListBox.cpp:169
 #: hugin1/stitch_project/hugin_stitch_project.cpp:411
 msgid "Error"
 msgstr "Fejl"
 
-#: hugin1/base_wx/huginConfig.cpp:57 hugin1/base_wx/huginConfig.cpp:69
-#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/RunStitchPanel.cpp:111
-#: hugin1/hugin/AssistantPanel.cpp:481 hugin1/hugin/PanoPanel.cpp:1206
+#: hugin1/base_wx/huginConfig.cpp:57
+#: hugin1/base_wx/huginConfig.cpp:69
+#: hugin1/base_wx/platform.cpp:125
+#: hugin1/base_wx/RunStitchPanel.cpp:111
+#: hugin1/hugin/AssistantPanel.cpp:481
+#: hugin1/hugin/PanoPanel.cpp:1206
 #, c-format
 msgid "External program %s not found in the bundle, reverting to system path"
-msgstr ""
-"Eksternt program %s blev ikke fundet i programpakken; bruger i stedet "
-"systemsti"
-
-#: hugin1/base_wx/huginConfig.cpp:95 hugin1/base_wx/huginConfig.cpp:109
+msgstr "Eksternt program %s blev ikke fundet i programpakken; bruger i stedet systemsti"
+
+#: hugin1/base_wx/huginConfig.cpp:95
+#: hugin1/base_wx/huginConfig.cpp:109
 #, c-format
 msgid "Program %s not found in preferences, reverting to default value"
-msgstr ""
-"Programmet %s blev ikke fundet i indstillingerne, bruger i stedet "
-"standardværdi"
-
-#: hugin1/base_wx/huginConfig.cpp:129 hugin1/base_wx/huginConfig.cpp:134
-#: hugin1/base_wx/huginConfig.cpp:140 hugin1/base_wx/huginConfig.cpp:145
-#: hugin1/base_wx/huginConfig.cpp:150 hugin1/base_wx/huginConfig.cpp:155
-#: hugin1/base_wx/huginConfig.cpp:161 hugin1/base_wx/huginConfig.cpp:166
-#: hugin1/base_wx/huginConfig.cpp:171 hugin1/base_wx/huginConfig.cpp:176
-#: hugin1/base_wx/huginConfig.cpp:182 hugin1/base_wx/huginConfig.cpp:187
-#: hugin1/base_wx/huginConfig.cpp:194 hugin1/base_wx/huginConfig.cpp:199
-#: hugin1/base_wx/huginConfig.cpp:219 hugin1/base_wx/huginConfig.cpp:224
-#: hugin1/base_wx/huginConfig.cpp:230 hugin1/base_wx/huginConfig.cpp:235
-#: hugin1/base_wx/huginConfig.cpp:240 hugin1/base_wx/huginConfig.cpp:245
-#: hugin1/base_wx/huginConfig.cpp:253 hugin1/base_wx/wxLensDB.cpp:232
-#: hugin1/base_wx/wxLensDB.cpp:607 hugin1/base_wx/wxLensDB.cpp:659
-#: hugin1/base_wx/wxLensDB.cpp:931 hugin1/base_wx/wxLensDB.cpp:936
+msgstr "Programmet %s blev ikke fundet i indstillingerne, bruger i stedet standardværdi"
+
+#: hugin1/base_wx/huginConfig.cpp:129
+#: hugin1/base_wx/huginConfig.cpp:134
+#: hugin1/base_wx/huginConfig.cpp:140
+#: hugin1/base_wx/huginConfig.cpp:145
+#: hugin1/base_wx/huginConfig.cpp:150
+#: hugin1/base_wx/huginConfig.cpp:155
+#: hugin1/base_wx/huginConfig.cpp:161
+#: hugin1/base_wx/huginConfig.cpp:166
+#: hugin1/base_wx/huginConfig.cpp:171
+#: hugin1/base_wx/huginConfig.cpp:176
+#: hugin1/base_wx/huginConfig.cpp:182
+#: hugin1/base_wx/huginConfig.cpp:187
+#: hugin1/base_wx/huginConfig.cpp:194
+#: hugin1/base_wx/huginConfig.cpp:199
+#: hugin1/base_wx/huginConfig.cpp:219
+#: hugin1/base_wx/huginConfig.cpp:224
+#: hugin1/base_wx/huginConfig.cpp:230
+#: hugin1/base_wx/huginConfig.cpp:235
+#: hugin1/base_wx/huginConfig.cpp:240
+#: hugin1/base_wx/huginConfig.cpp:245
+#: hugin1/base_wx/huginConfig.cpp:253
+#: hugin1/base_wx/wxLensDB.cpp:232
+#: hugin1/base_wx/wxLensDB.cpp:607
+#: hugin1/base_wx/wxLensDB.cpp:659
+#: hugin1/base_wx/wxLensDB.cpp:931
+#: hugin1/base_wx/wxLensDB.cpp:936
 #: hugin1/calibrate_lens/LensCalFrame.cpp:415
 #: hugin1/calibrate_lens/LensCalFrame.cpp:594
 #: hugin1/calibrate_lens/LensCalFrame.cpp:617
@@ -90,54 +116,70 @@
 #: hugin1/calibrate_lens/LensCalFrame.cpp:768
 #: hugin1/calibrate_lens/LensCalFrame.cpp:794
 #: hugin1/calibrate_lens/LensCalFrame.cpp:866
-#: hugin1/hugin/AssistantPanel.cpp:437 hugin1/hugin/CPDetectorDialog.cpp:121
-#: hugin1/hugin/GLPreviewFrame.cpp:1398 hugin1/hugin/GLPreviewFrame.cpp:1405
-#: hugin1/hugin/GLPreviewFrame.cpp:1412 hugin1/hugin/GLPreviewFrame.cpp:1426
-#: hugin1/hugin/GLPreviewFrame.cpp:1433 hugin1/hugin/GLPreviewFrame.cpp:1440
-#: hugin1/hugin/MainFrame.cpp:742 hugin1/hugin/MainFrame.cpp:1790
-#: hugin1/hugin/MaskEditorPanel.cpp:448 hugin1/hugin/PreferencesDialog.cpp:934
+#: hugin1/hugin/AssistantPanel.cpp:437
+#: hugin1/hugin/CPDetectorDialog.cpp:121
+#: hugin1/hugin/GLPreviewFrame.cpp:1398
+#: hugin1/hugin/GLPreviewFrame.cpp:1405
+#: hugin1/hugin/GLPreviewFrame.cpp:1412
+#: hugin1/hugin/GLPreviewFrame.cpp:1426
+#: hugin1/hugin/GLPreviewFrame.cpp:1433
+#: hugin1/hugin/GLPreviewFrame.cpp:1440
+#: hugin1/hugin/MainFrame.cpp:742
+#: hugin1/hugin/MainFrame.cpp:1790
+#: hugin1/hugin/MaskEditorPanel.cpp:448
+#: hugin1/hugin/PreferencesDialog.cpp:934
 #: hugin1/ptbatcher/FindPanoDialog.cpp:240
 #: hugin1/ptbatcher/FindPanoDialog.cpp:261
 msgid "Warning"
 msgstr "Advarsel"
 
-#: hugin1/base_wx/LensTools.cpp:37 hugin1/hugin/ImagesList.cpp:608
+#: hugin1/base_wx/LensTools.cpp:37
+#: hugin1/hugin/ImagesList.cpp:608
 msgid "Normal (rectilinear)"
 msgstr "Normal (retliniet)"
 
-#: hugin1/base_wx/LensTools.cpp:38 hugin1/hugin/ImagesList.cpp:609
+#: hugin1/base_wx/LensTools.cpp:38
+#: hugin1/hugin/ImagesList.cpp:609
 msgid "Panoramic (cylindrical)"
 msgstr "Panoramisk (cylindrisk)"
 
-#: hugin1/base_wx/LensTools.cpp:39 hugin1/hugin/ImagesList.cpp:610
+#: hugin1/base_wx/LensTools.cpp:39
+#: hugin1/hugin/ImagesList.cpp:610
 msgid "Circular fisheye"
 msgstr "Cirkulært fiskeøje"
 
-#: hugin1/base_wx/LensTools.cpp:40 hugin1/hugin/ImagesList.cpp:611
+#: hugin1/base_wx/LensTools.cpp:40
+#: hugin1/hugin/ImagesList.cpp:611
 msgid "Full frame fisheye"
 msgstr "Full-frame fiskeøje"
 
-#: hugin1/base_wx/LensTools.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1301
-#: hugin1/hugin/ImagesList.cpp:612 hugin1/hugin/PreviewFrame.cpp:622
+#: hugin1/base_wx/LensTools.cpp:41
+#: hugin1/hugin/GLPreviewFrame.cpp:1301
+#: hugin1/hugin/ImagesList.cpp:612
+#: hugin1/hugin/PreviewFrame.cpp:622
 msgid "Equirectangular"
 msgstr "Ækvirektangulært"
 
-#: hugin1/base_wx/LensTools.cpp:42 hugin1/hugin/ImagesList.cpp:613
+#: hugin1/base_wx/LensTools.cpp:42
+#: hugin1/hugin/ImagesList.cpp:613
 #: hugin1/hugin/PanoPanel.cpp:158
 msgid "Orthographic"
 msgstr "Ortografisk"
 
-#: hugin1/base_wx/LensTools.cpp:43 hugin1/hugin/ImagesList.cpp:614
+#: hugin1/base_wx/LensTools.cpp:43
+#: hugin1/hugin/ImagesList.cpp:614
 #: hugin1/hugin/PanoPanel.cpp:148
 msgid "Stereographic"
 msgstr "Stereografisk"
 
-#: hugin1/base_wx/LensTools.cpp:44 hugin1/hugin/ImagesList.cpp:615
+#: hugin1/base_wx/LensTools.cpp:44
+#: hugin1/hugin/ImagesList.cpp:615
 #: hugin1/hugin/PanoPanel.cpp:159
 msgid "Equisolid"
 msgstr "Ækvisolid"
 
-#: hugin1/base_wx/LensTools.cpp:45 hugin1/hugin/ImagesList.cpp:616
+#: hugin1/base_wx/LensTools.cpp:45
+#: hugin1/hugin/ImagesList.cpp:616
 msgid "Fisheye Thoby"
 msgstr "Fiskeøje-Thoby"
 
@@ -178,13 +220,32 @@
 
 #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:606
 #: hugin1/ptbatcher/RunStitchFrame.cpp:43
-#: hugin1/stitch_project/hugin_stitch_project.cpp:126 translations/xrc.cpp:33
-#: translations/xrc.cpp:162 translations/xrc.cpp:300 translations/xrc.cpp:316
-#: translations/xrc.cpp:323 translations/xrc.cpp:534 translations/xrc.cpp:604
-#: translations/xrc.cpp:608 translations/xrc.cpp:612 translations/xrc.cpp:706
-#: translations/xrc.cpp:853 translations/xrc.cpp:891 translations/xrc.cpp:1054
-#: xrc.cpp:33 xrc.cpp:162 xrc.cpp:300 xrc.cpp:316 xrc.cpp:323 xrc.cpp:534
-#: xrc.cpp:604 xrc.cpp:608 xrc.cpp:612 xrc.cpp:706 xrc.cpp:853 xrc.cpp:891
+#: hugin1/stitch_project/hugin_stitch_project.cpp:126
+#: translations/xrc.cpp:33
+#: translations/xrc.cpp:162
+#: translations/xrc.cpp:300
+#: translations/xrc.cpp:316
+#: translations/xrc.cpp:323
+#: translations/xrc.cpp:534
+#: translations/xrc.cpp:604
+#: translations/xrc.cpp:608
+#: translations/xrc.cpp:612
+#: translations/xrc.cpp:706
+#: translations/xrc.cpp:853
+#: translations/xrc.cpp:891
+#: translations/xrc.cpp:1054
+#: xrc.cpp:33
+#: xrc.cpp:162
+#: xrc.cpp:300
+#: xrc.cpp:316
+#: xrc.cpp:323
+#: xrc.cpp:534
+#: xrc.cpp:604
+#: xrc.cpp:608
+#: xrc.cpp:612
+#: xrc.cpp:706
+#: xrc.cpp:853
+#: xrc.cpp:891
 #: xrc.cpp:1054
 msgid "Cancel"
 msgstr "Annullér"
@@ -202,41 +263,40 @@
 msgstr "Optimerer Panorama"
 
 #: hugin1/base_wx/platform.h:40
-msgid ""
-"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*."
-"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|"
-"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*."
-"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*."
-"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*"
-msgstr ""
-"Alle billedfiler|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*."
-"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|"
-"JPEG-filer (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF-filer (*.tif,*."
-"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG-filer (*.png)|*.png;*.PNG|HDR-filer (*."
-"hdr)|*.hdr;*.HDR|EXR-filer (*.exr)|*.exr;*.EXR|Alle filer (*)|*"
-
-#: hugin1/base_wx/PTWXDlg.cpp:49 hugin1/base_wx/PTWXDlg.cpp:68
-#: hugin1/base_wx/PTWXDlg.cpp:122 translations/xrc.cpp:854 xrc.cpp:854
+msgid "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*"
+msgstr "Alle billedfiler|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG-filer (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF-filer (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG-filer (*.png)|*.png;*.PNG|HDR-filer (*.hdr)|*.hdr;*.HDR|EXR-filer (*.exr)|*.exr;*.EXR|Alle filer (*)|*"
+
+#: hugin1/base_wx/PTWXDlg.cpp:49
+#: hugin1/base_wx/PTWXDlg.cpp:68
+#: hugin1/base_wx/PTWXDlg.cpp:122
+#: translations/xrc.cpp:854
+#: xrc.cpp:854
 msgid "Panorama Tools"
 msgstr "Panorama Tools"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:135 hugin1/base_wx/RunStitchPanel.cpp:304
+#: hugin1/base_wx/RunStitchPanel.cpp:135
+#: hugin1/base_wx/RunStitchPanel.cpp:304
 msgid "Could not open project file:"
 msgstr "Kunne ikke åbne projektfil:"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:145 hugin1/base_wx/RunStitchPanel.cpp:312
-#: hugin1/nona_gui/nona_gui.cpp:243 hugin1/ptbatcher/ProjectArray.cpp:88
+#: hugin1/base_wx/RunStitchPanel.cpp:145
+#: hugin1/base_wx/RunStitchPanel.cpp:312
+#: hugin1/nona_gui/nona_gui.cpp:243
+#: hugin1/ptbatcher/ProjectArray.cpp:88
 #, c-format
 msgid "could not open script : %s"
 msgstr "kunne ikke åbne script: %s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:166 hugin1/base_wx/RunStitchPanel.cpp:320
-#: hugin1/nona_gui/nona_gui.cpp:250 hugin1/ptbatcher/ProjectArray.cpp:115
+#: hugin1/base_wx/RunStitchPanel.cpp:166
+#: hugin1/base_wx/RunStitchPanel.cpp:320
+#: hugin1/nona_gui/nona_gui.cpp:250
+#: hugin1/ptbatcher/ProjectArray.cpp:115
 #, c-format
 msgid "error while parsing panotools script: %s"
 msgstr "fejl under tolkning af panotools script: %s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:227
+#: hugin1/base_wx/RunStitchPanel.cpp:210
+#: hugin1/base_wx/RunStitchPanel.cpp:227
 #: hugin1/base_wx/RunStitchPanel.cpp:346
 msgid "Could not create temporary file"
 msgstr "Kunne ikke oprette midlertidig fil"
@@ -267,7 +327,8 @@
 "Fejl under sammenføjning af projekt\n"
 "%s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:287 hugin1/base_wx/RunStitchPanel.cpp:293
+#: hugin1/base_wx/RunStitchPanel.cpp:287
+#: hugin1/base_wx/RunStitchPanel.cpp:293
 #: hugin1/stitch_project/hugin_stitch_project.cpp:177
 msgid "Error during stitching"
 msgstr "Fejl under sammenføjning"
@@ -281,86 +342,87 @@
 "Fejl under kørsel af assistent\n"
 "%s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:366 hugin1/base_wx/RunStitchPanel.cpp:374
+#: hugin1/base_wx/RunStitchPanel.cpp:366
+#: hugin1/base_wx/RunStitchPanel.cpp:374
 msgid "Error during running assistant"
 msgstr "Fejl under kørsel af assistent"
 
 #: hugin1/base_wx/wxLensDB.cpp:232
-#, fuzzy, c-format
+#, c-format
 msgid "The input \"%s\" is not a valid number."
-msgstr "Input \"%s\" for %s er ikke et gyldigt tal\n"
+msgstr "Input \"%s\" er ikke et gyldigt tal."
 
 #: hugin1/base_wx/wxLensDB.cpp:296
 #, c-format
 msgid "%d lenses found."
-msgstr ""
+msgstr "%d objektiver fundet."
 
 #: hugin1/base_wx/wxLensDB.cpp:300
-#, fuzzy
 msgid "No lens found."
-msgstr "Ingen mulige panoramaer fundet."
+msgstr "Intet objektiv fundet."
 
 #: hugin1/base_wx/wxLensDB.cpp:607
-#, fuzzy
-msgid ""
-"There are too less information for saving data into database. Please check "
-"your input!"
-msgstr ""
-"Der er ugyldige værdier i inputfelterne.\n"
-"Check venligst dine input."
+msgid "There are too less information for saving data into database. Please check your input!"
+msgstr "Der er utilstrækkelig information for at gemme data i databasen. Check venligst dine input!"
 
 #: hugin1/base_wx/wxLensDB.cpp:658
 #, c-format
 msgid ""
 "You selected the folder \"%s\" to save your database file.\n"
-"This is not the default folder. You won't be able to automatically load "
-"these informations back into Hugin.\n"
+"This is not the default folder. You won't be able to automatically load these informations back into Hugin.\n"
 "The default folder for the database files is \"%s\".\n"
 "Do you want to proceed anyway?"
 msgstr ""
+"Du valgte at gemme din databasefil i mappen \"%s\".\n"
+"Dette er ikke standardmappen. Du vil ikke automatisk kunne indlæse disse informationer tilbage til Hugin.\n"
+"Standardmappen for databasefilen er \"%s\".\n"
+"Vil du fortsætte alligevel?"
 
 #: hugin1/base_wx/wxLensDB.cpp:706
-#, fuzzy
 msgid "Save lens into database file"
-msgstr "Gem fil med objektivparametre"
-
-#: hugin1/base_wx/wxLensDB.cpp:708 hugin1/base_wx/wxLensDB.cpp:962
-#, fuzzy
+msgstr "Gem objektiv i databasefil"
+
+#: hugin1/base_wx/wxLensDB.cpp:708
+#: hugin1/base_wx/wxLensDB.cpp:962
 msgid "Lensfun database files (*.xml)|*.xml"
-msgstr "PTmender-filer (*.txt)|*.txt"
-
-#: hugin1/base_wx/wxLensDB.cpp:749 hugin1/base_wx/wxLensDB.cpp:762
-#: hugin1/base_wx/wxLensDB.cpp:808 hugin1/base_wx/wxLensDB.cpp:983
+msgstr "Lensfun databasefiler (*.xml)|*.xml"
+
+#: hugin1/base_wx/wxLensDB.cpp:749
+#: hugin1/base_wx/wxLensDB.cpp:762
+#: hugin1/base_wx/wxLensDB.cpp:808
+#: hugin1/base_wx/wxLensDB.cpp:983
 msgid "Could not save information into database file."
-msgstr ""
+msgstr "Kunne ikke gemme information i databasefilen."
 
 #: hugin1/base_wx/wxLensDB.cpp:815
 msgid "Could not initialize database."
-msgstr ""
+msgstr "Kunne ikke initialisere databasen."
 
 #: hugin1/base_wx/wxLensDB.cpp:819
 #, c-format
 msgid ""
-"The current selected lens does not match with the information of this lens "
-"in the selected database file.\n"
+"The current selected lens does not match with the information of this lens in the selected database file.\n"
 "Could not proceed.\n"
 "(Error code: %d)"
 msgstr ""
+"Det aktuelt valgte objektiv passer ikke overens med informationen om samme objektiv i den valgte databasefil.\n"
+"Kunne ikke fortsætte.\n"
+"(Fejlkode: %d)"
 
 #: hugin1/base_wx/wxLensDB.cpp:931
 msgid "The maker field contains only an empty string."
-msgstr ""
+msgstr "Producent-feltet indeholder kun en tom streng."
 
 #: hugin1/base_wx/wxLensDB.cpp:936
 msgid "The model field contains only an empty string."
-msgstr ""
+msgstr "Model-feltet indeholder kun en tom streng."
 
 #: hugin1/base_wx/wxLensDB.cpp:960
-#, fuzzy
 msgid "Save camera into database file"
-msgstr "Gem objektivparametre til en fil"
-
-#: hugin1/calibrate_lens/LensCalApp.cpp:66 hugin1/hugin/huginApp.cpp:193
+msgstr "Gem kamera i databasefil"
+
+#: hugin1/calibrate_lens/LensCalApp.cpp:66
+#: hugin1/hugin/huginApp.cpp:193
 #: hugin1/ptbatcher/PTBatcherGUI.cpp:80
 msgid "xrc directory not found in bundle"
 msgstr "xrc-mappe blev ikke fundet i programpakke"
@@ -368,28 +430,35 @@
 #: hugin1/calibrate_lens/LensCalApp.cpp:66
 #: hugin1/calibrate_lens/LensCalApp.cpp:74
 #: hugin1/calibrate_lens/LensCalApp.cpp:80
-#: hugin1/calibrate_lens/LensCalApp.cpp:92 hugin1/hugin/huginApp.cpp:193
-#: hugin1/hugin/huginApp.cpp:205 hugin1/hugin/huginApp.cpp:214
-#: hugin1/hugin/huginApp.cpp:228 hugin1/hugin/MainFrame.cpp:2059
-#: hugin1/ptbatcher/PTBatcherGUI.cpp:80 hugin1/ptbatcher/PTBatcherGUI.cpp:91
-#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119
+#: hugin1/calibrate_lens/LensCalApp.cpp:92
+#: hugin1/hugin/huginApp.cpp:193
+#: hugin1/hugin/huginApp.cpp:205
+#: hugin1/hugin/huginApp.cpp:214
+#: hugin1/hugin/huginApp.cpp:228
+#: hugin1/hugin/MainFrame.cpp:2059
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:80
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:91
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:97
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:119

[Hugin-cvs] /hgroot/hugin/hugin: Little update to PTBatcherGUI main window f...

From: <hugin-cvs@li...> - 2012-07-23 17:20

branch:     gui_overhaul
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/8b35de1371b0
changeset:  5903:8b35de1371b0
user:       tmodes
date:       Mon Jul 23 19:19:58 2012 +0200
description:

Little update to PTBatcherGUI main window for better wxWidgets 2.9.4 compatibility

diffstat:

 src/hugin1/hugin/xrc/batch_frame.xrc |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r d640a4064543 -r 8b35de1371b0 src/hugin1/hugin/xrc/batch_frame.xrc
--- a/src/hugin1/hugin/xrc/batch_frame.xrc	Sun Jul 22 17:46:47 2012 +0200
+++ b/src/hugin1/hugin/xrc/batch_frame.xrc	Mon Jul 23 19:19:58 2012 +0200
@@ -16,6 +16,7 @@
               </object>
               <option>1</option>
               <flag>wxEXPAND</flag>
+              <minsize>200,100</minsize>
             </object>
             <object class="sizeritem">
               <object class="wxBoxSizer">

[Hugin-cvs] /hgroot/hugin/hugin: red splash screen to indicate release cycle...

From: <hugin-cvs@li...> - 2012-07-23 05:30

branch:     2012.0
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/774550436f28
changeset:  5902:774550436f28
user:       harryvanderwolf <hvdwolf@...>
date:       Mon Jul 23 07:26:54 2012 +0200
description:

red splash screen to indicate release cycle with no artwork selected yet

diffstat:

 CMakeLists.txt                       |    4 ++--
 mac/Version.xcconfig                 |    4 ++--
 src/hugin1/hugin/xrc/data/splash.png |    0 
 3 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 2d29fbedc166 -r 774550436f28 CMakeLists.txt
--- a/CMakeLists.txt	Mon Jul 23 06:54:53 2012 +0200
+++ b/CMakeLists.txt	Mon Jul 23 07:26:54 2012 +0200
@@ -39,8 +39,8 @@
 project(hugin)
 
 # version
-set(V_MAJOR 2011)
-set(V_MINOR 5)
+set(V_MAJOR 2012)
+set(V_MINOR 0)
 set(V_PATCH 0)
 
 #
diff -r 2d29fbedc166 -r 774550436f28 mac/Version.xcconfig
--- a/mac/Version.xcconfig	Mon Jul 23 06:54:53 2012 +0200
+++ b/mac/Version.xcconfig	Mon Jul 23 07:26:54 2012 +0200
@@ -10,8 +10,8 @@
 //overrides above values if checked out from SVN
 #include "../mac/HG-rev.xcconfig"
 
-HUGIN_VERSION_MAJOR = 2011
-HUGIN_VERSION_MINOR = 5
+HUGIN_VERSION_MAJOR = 2012
+HUGIN_VERSION_MINOR = 0
 HUGIN_VERSION_PATCH = 0
 
 HUGIN_PACKAGE_VERSION = $(HUGIN_VERSION_MAJOR).$(HUGIN_VERSION_MINOR).$(HUGIN_VERSION_PATCH)$(HUGIN_PRERELEASE_VERSION_TAG)
diff -r 2d29fbedc166 -r 774550436f28 src/hugin1/hugin/xrc/data/splash.png
Binary file src/hugin1/hugin/xrc/data/splash.png has changed

[Hugin-cvs] /hgroot/hugin/hugin: Updated Changelog for release cycle 2012.0

From: <hugin-cvs@li...> - 2012-07-23 04:55

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/2d29fbedc166
changeset:  5901:2d29fbedc166
user:       harryvanderwolf <hvdwolf@...>
date:       Mon Jul 23 06:54:53 2012 +0200
description:

Updated Changelog for release cycle 2012.0

diffstat:

 ChangeLog |  3029 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 3012 insertions(+), 17 deletions(-)

diffs (truncated from 3073 to 500 lines):

diff -r b5a1699d5b4c -r 2d29fbedc166 ChangeLog
--- a/ChangeLog	Mon Jul 23 06:51:44 2012 +0200
+++ b/ChangeLog	Mon Jul 23 06:54:53 2012 +0200
@@ -1,4 +1,3000 @@
-2011-06-19 22:16 +0100  Bruno Postle <bruno@...>  (84e37554ce38)  tip
+2012-07-23 06:51 +0200  harryvanderwolf <hvdwolf@...>  (b5a1699d5b4c)  tip
+
+	No translation changes but timestamp for next release
+
+	> src/translations/bg.po
+	> src/translations/ca_ES.po
+	> src/translations/cs_CZ.po
+	> src/translations/da.po
+	> src/translations/de.po
+	> src/translations/en_GB.po
+	> src/translations/es.po
+	> src/translations/fi.po
+	> src/translations/fr.po
+	> src/translations/hu.po
+	> src/translations/hugin.pot
+	> src/translations/it.po
+	> src/translations/ja.po
+	> src/translations/ko.po
+	> src/translations/nl.po
+	> src/translations/pl.po
+	> src/translations/pt_BR.po
+	> src/translations/ro.po
+	> src/translations/ru.po
+	> src/translations/sk.po
+	> src/translations/sl.po
+	> src/translations/sv.po
+	> src/translations/uk.po
+	> src/translations/zh_CN.po
+	> src/translations/zh_TW.po
+
+2012-07-21 14:03 +0200  tmodes  (139a81e90f96)  
+
+	Calibrate_lens_gui: Fixes crash when clicking on empty canvas
+
+	> src/hugin1/calibrate_lens/LensCalImageCtrl.cpp
+
+2012-07-21 13:20 +0200  Vaclav Cerny <vatoz@...>  (e7380dfd602a)  
+
+	Czech translation updated
+
+	> src/translations/cs_CZ.po
+
+2012-07-21 08:39 +1000  Terry Duell <tduell@...>  (2accee7b9811)  
+
+	edited draft 2012.0 release notes
+
+	> doc/releases/hugin-2012.0.0.txt
+
+2012-07-20 15:39 +1000  Terry Duell <tduell@...>  (9dfbe5f1dd3a)  
+
+	draft 2012.0 release notes
+
+	+ doc/releases/hugin-2012.0.0.txt
+
+2012-07-18 20:03 +0100  Bruno Postle <bruno@...>  (4152c423a8f3)  
+
+	Fix detection of lensfun.h for lensfun-0.2.6
+
+	> CMakeModules/FindLensfun.cmake
+
+2012-07-08 08:01 +0200  harryvanderwolf <hvdwolf@...>  (22ea640284b4)  
+
+	[OSX] some adjustments to XCode and scripts before release
+
+	> mac/ExternalPrograms/scripts/multiblend.sh
+	> mac/Hugin.xcodeproj/project.pbxproj
+	> mac/scripted_universal_build/01-Compile_hugin.sh
+	- mac/scripted_universal_build/01-Compile_hugin_0.8.sh
+
+2012-06-26 21:50 +0200  tmodes  (cf3324753b7f)  
+
+	Updated translations with new strings
+
+	> src/translations/bg.po
+	> src/translations/ca_ES.po
+	> src/translations/cs_CZ.po
+	> src/translations/da.po
+	> src/translations/de.po
+	> src/translations/en_GB.po
+	> src/translations/es.po
+	> src/translations/fi.po
+	> src/translations/fr.po
+	> src/translations/hu.po
+	> src/translations/hugin.pot
+	> src/translations/it.po
+	> src/translations/ja.po
+	> src/translations/ko.po
+	> src/translations/nl.po
+	> src/translations/pl.po
+	> src/translations/pt_BR.po
+	> src/translations/ro.po
+	> src/translations/ru.po
+	> src/translations/sk.po
+	> src/translations/sl.po
+	> src/translations/sv.po
+	> src/translations/uk.po
+	> src/translations/zh_CN.po
+	> src/translations/zh_TW.po
+
+2012-06-26 21:18 +0200  tmodes  (9c8b82078895)  
+
+	Fixes compiling error introduced by transplanting changeset from
+	gui_overhaul branch
+
+	> src/hugin1/hugin/PanoPanel.cpp
+
+2012-06-26 20:58 +0200  tmodes  (1d43a23edc60)  
+
+	[OSX] Set Full screen from F11 (all combinations grabbed by OSX) to
+	Command-F
+
+	> src/hugin1/hugin/GLPreviewFrame.cpp
+	> src/hugin1/hugin/PreviewFrame.cpp
+	> src/hugin1/hugin/xrc/main_menu.xrc
+
+2012-06-18 18:43 +0200  tmodes  (afacac93025e)  
+
+	Fixes also keypoints after changeset 35cde63105dc
+
+	> src/hugin_cpfind/localfeatures/keypoints.cpp
+
+2012-06-14 17:46 +0200  tmodes  (f01411e8cd35)  
+
+	cpfind: Reduce memory usage a little bit
+
+	> src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp
+	> src/hugin_cpfind/localfeatures/Image.cpp
+	> src/hugin_cpfind/localfeatures/Image.h
+
+2012-06-12 19:16 +0200  tmodes  (ab46fcb21182)  
+
+	Improved overlap calculation for multirow cpfind
+
+	> src/hugin_cpfind/cpfind/PanoDetector.cpp
+	> src/hugin_cpfind/cpfind/PanoDetector.h
+
+2012-06-11 17:49 +0200  tmodes  (034758d1e78e)  
+
+	cpfind: Add pair wise matching to multirow heuristic if multirow was
+	not successful
+
+	> src/hugin_cpfind/cpfind/PanoDetector.cpp
+	> src/hugin_cpfind/cpfind/PanoDetector.h
+
+2012-05-31 18:58 +0200  tmodes  (a60692352f59)  
+
+	[Windows] Bugfix for finding lensfun.dll
+
+	> CMakeModules/win_bundle.cmake
+
+2012-05-30 19:34 +0200  tmodes  (2def9e17d450)  
+
+	Cpfind: Improved max memory setting for 32 bit build on 64 bit
+	systems
+
+	> src/hugin_cpfind/cpfind/Utils.cpp
+
+2012-05-29 17:31 +0200  tmodes  (aa95c190498f)  
+
+	Cpfind: Fixes crash if no keypoint found
+
+	> src/hugin_cpfind/cpfind/PanoDetector.cpp
+	> src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp
+
+2012-05-21 18:08 +0200  tmodes  (a9a3cbdecfda)  
+
+	Fixes a warning with wxWidgets 2.9
+
+	> src/hugin1/hugin/GLPreviewFrame.cpp
+
+2012-05-19 11:34 +0200  tmodes  (86da8d5c8e18)  
+
+	[Windows] Updated CMake scripts for some newer versions
+
+	> CMakeModules/FindJPEG.cmake
+	> CMakeModules/FindTIFF.cmake
+	> CMakeModules/win_bundle.cmake
+
+2012-05-19 09:55 +0200  tmodes  (e091a8bcf92f)  
+
+	Fixes an include statement
+
+	> src/hugin1/icpfind/AutoCtrlPointCreator.cpp
+
+2012-05-13 17:44 +0200  tmodes  (b96ecf1468a3)  
+
+	Added option to keep exposure fused stacks
+
+	> src/hugin1/hugin/PanoPanel.cpp
+	> src/hugin1/hugin/xrc/pano_panel.xrc
+	> src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp
+	> src/hugin_base/panodata/Panorama.cpp
+	> src/hugin_base/panodata/PanoramaOptions.h
+
+2012-05-12 17:18 +0200  tmodes  (fe1d1a6744e4)  
+
+	Fixes numeric transformation dialog on old preview window
+
+	> src/hugin1/hugin/CMakeLists.txt
+	> src/hugin1/hugin/xrc/preview_frame.xrc
+	- src/hugin1/hugin/NumTransDialog.cpp
+	- src/hugin1/hugin/NumTransDialog.h
+
+2012-05-06 10:06 +0200  tmodes  (6dc3288ce353)  
+
+	Show short message when PTBatcherGUI was started minimized
+
+	> src/hugin1/ptbatcher/PTBatcherGUI.cpp
+
+2012-06-09 09:43 +0200  tmodes  (3503954d9b7e)  
+
+	Updated Simplified Chinese translation (Lu Fang)
+
+	> src/translations/zh_CN.po
+
+2012-05-20 19:09 +0200  harryvanderwolf <hvdwolf@...>  (aa82fe95d603)  
+
+	[KFJ] also update api-max in shooting_pattern.py from 2011.1 to
+	2011.5
+
+	> src/hugin_script_interface/plugins/shooting_pattern.py
+
+2012-05-20 18:49 +0200  harryvanderwolf <hvdwolf@...>  (94678feaaa02)  
+
+	[KFJ] Update api-max to 2011.5 in python scripts
+
+	> src/hugin_script_interface/plugins-dev/dual_use.py
+	> src/hugin_script_interface/plugins-dev/plugin_skeleton.py
+	> src/hugin_script_interface/plugins/crop_cp.py
+	> src/hugin_script_interface/plugins/top_five.py
+
+2012-05-08 10:40 +0200  lauritsen  (19ab5dd796c4)  
+
+	Fisheye is fiskeøje in Danish, plus some other corrections.
+
+	> src/translations/da.po
+
+2012-05-07 20:10 +0200  harryvanderwolf <hvdwolf@...>  (c2402b468577)  
+
+	[OSX] double declaration of wxString in PTBatcherGui.cpp
+
+	> src/hugin1/ptbatcher/PTBatcherGUI.cpp
+
+2012-05-04 21:55 +0100  Bruno Postle <bruno@...>  (3c494c5c1f40)  
+
+	Allow negative crop values with pto_gen, for circular fisheye photos
+
+	> src/tools/pto_gen.cpp
+
+2012-05-02 19:41 +0200  tmodes  (f949010d7f50)  
+
+	[OSX] More fixes for reading public lensfun database
+
+	> src/hugin1/calibrate_lens/LensCalApp.cpp
+	> src/hugin1/ptbatcher/PTBatcherGUI.cpp
+	> src/tools/pto_gen.cpp
+
+2012-05-01 18:13 +0200  harryvanderwolf <hvdwolf@...>  (16c1e51c8d52)  
+
+	[OSX] patch to make public lensfun databases work from the bundle
+	(patch code by Thomas Modes); Many small changes to build scripts
+	w.r.t. openmp/lion; Some minor changes and bugfixes to the XCode
+	project (regression errors?)
+
+	> mac/Hugin.xcodeproj/project.pbxproj
+	> mac/complete-bundle.sh
+	> src/hugin1/hugin/huginApp.cpp
+
+2012-05-01 09:19 +0200  harryvanderwolf <hvdwolf@...>  (65e81ec8adc9)  
+
+	[OSX] forgot to commit python script
+
+	+ mac/ExternalPrograms/scripts/python27.sh
+
+2012-05-01 09:17 +0200  harryvanderwolf <hvdwolf@...>  (f11f85ff8d01)  
+
+	[OSX] more changes to build scripts w.r.t. openmp and lion
+
+	+ mac/ExternalPrograms/scripts/libpng14_for_enblendvigra.diff
+	> mac/ExternalPrograms/scripts/boost.sh
+	> mac/ExternalPrograms/scripts/build-all.sh
+	> mac/ExternalPrograms/scripts/enblend.sh
+	> mac/ExternalPrograms/scripts/gettext.sh
+	> mac/ExternalPrograms/scripts/lensfun.sh
+	> mac/ExternalPrograms/scripts/libglew.sh
+	> mac/ExternalPrograms/scripts/libglib2.sh
+	> mac/ExternalPrograms/scripts/libjpeg.sh
+	> mac/ExternalPrograms/scripts/libpng.sh
+	> mac/ExternalPrograms/scripts/libtiff.sh
+	> mac/ExternalPrograms/scripts/multiblend.sh
+	> mac/ExternalPrograms/scripts/pano13.sh
+	> mac/Hugin.xcodeproj/project.pbxproj
+	> mac/complete-bundle.sh
+
+2012-04-30 09:22 +0200  Kornel Benko <kornelbenko@...>  (b4d44ecad7d0)  
+
+	Make use of python scriping interface be default on unix.
+
+	> CMakeLists.txt
+
+2012-04-28 15:41 +0200  tmodes  (f823a928e113)  
+
+	Updated Spanish translation (Jorge González)
+
+	> src/translations/es.po
+
+2012-04-19 20:34 +0200  mcri  (4f5f884bb728)  
+
+	Updated Italian translation
+
+	> src/translations/it.po
+
+2012-04-19 18:28 +0200  harryvanderwolf <hvdwolf@...>  (79d1922aeba7)  
+
+	[OSX] minor fixes to build scripts for both lensfun stuff as well as
+	the removal of PPC and Tiger support
+
+	> mac/ExternalPrograms/scripts/SetEnv-universal.txt
+	> mac/ExternalPrograms/scripts/boost.sh
+	> mac/ExternalPrograms/scripts/build-all.sh
+	> mac/ExternalPrograms/scripts/gnumake.sh
+	> mac/ExternalPrograms/scripts/lensfun.sh
+	> mac/ExternalPrograms/scripts/libglib2.sh
+	> mac/complete-bundle.sh
+
+2012-04-16 21:04 +0200  harryvanderwolf <hvdwolf@...>  (f1c1e4f56585)  
+
+	[OSX] remove 10.4 stuff and ppc from XCode project; step 2: Add
+	lensfun stuff to XCode project
+
+	> mac/BuildConfig.xcconfig.orig
+	> mac/Hugin.xcodeproj/project.pbxproj
+	> mac/complete-bundle.sh
+
+2012-04-15 22:18 +0200  harryvanderwolf <hvdwolf@...>  (63173b3a4a4b)  
+
+	[OSX] step 1: make build scripts for lensfun and its dependencies
+	libffi and glib-2
+
+	+ mac/ExternalPrograms/scripts/lensfun.sh
+	+ mac/ExternalPrograms/scripts/libffi.sh
+	+ mac/ExternalPrograms/scripts/libglib2.sh
+	> mac/ExternalPrograms/scripts/build-all.sh
+
+2012-04-15 15:47 +0200  tmodes  (e9e9cd112778)  
+
+	Show paths to lensfun db in about dialog
+
+	> src/hugin1/hugin/AboutDialog.cpp
+
+2012-04-14 15:23 +0200  harryvanderwolf <hvdwolf@...>  (ec316201a05d)  
+
+	[OSX] Drop support for Tiger (10.4.x) and for ARCH PPC; update
+	couple of libs
+
+	+ mac/ExternalPrograms/scripts/SetEnv-universal.txt
+	+ mac/ExternalPrograms/scripts/openexr17.sh
+	> mac/ExternalPrograms/scripts/boost.sh
+	> mac/ExternalPrograms/scripts/build-all.sh
+	> mac/ExternalPrograms/scripts/enblend-openmp.sh
+	> mac/ExternalPrograms/scripts/gettext.sh
+	> mac/ExternalPrograms/scripts/gsl.sh
+	> mac/ExternalPrograms/scripts/libexiv2.sh
+	> mac/ExternalPrograms/scripts/libexpat.sh
+	> mac/ExternalPrograms/scripts/libglew.sh
+	> mac/ExternalPrograms/scripts/multiblend.sh
+	> mac/ExternalPrograms/scripts/wxmac28.sh
+	> mac/Hugin.xcodeproj/project.pbxproj
+
+2012-04-07 16:40 +0200  Kay F. Jahnke <_kfj@...>  (85a1049f825a)  
+
+	Updated woa plugin and readme
+
+	> src/hugin_script_interface/plugins/README_woa.txt
+	> src/hugin_script_interface/plugins/woa.py
+
+2012-04-07 16:38 +0200  tmodes  (b49215057ed1)  
+
+	Updated Spanish translation (Jorge González)
+
+	> src/translations/es.po
+
+2012-03-31 12:18 +0200  Vaclav Cerny <vatoz@...>  (1df12874b3b1)  
+
+	Updated Czech translation
+
+	> src/hugin1/calibrate_lens/calibrate_lens_gui.desktop
+	> src/hugin1/ptbatcher/PTBatcherGUI.desktop
+	> src/tools/pto_gen.desktop
+	> src/translations/cs_CZ.po
+
+2012-03-24 11:00 +0100  tmodes  (5ada750d0a01)  
+
+	Added some tips regarding PTBatcherGUI
+
+	> src/hugin1/hugin/xrc/data/tips.txt
+
+2012-03-24 09:43 +0100  tmodes  (563c06bce5f3)  
+
+	Some message when no matching info for add time-series found
+	[678819]
+
+	> src/hugin1/hugin/MainFrame.cpp
+
+2012-03-18 17:41 +0100  tmodes  (7a8841757473)  
+
+	Fixes compilation of static build
+
+	+ CMakeModules/FindGLIB2.cmake
+	> CMakeModules/FindLensfun.cmake
+	> src/hugin_base/CMakeLists.txt
+	> src/hugin_base/lensdb/LensDB.h
+
+2012-03-18 11:08 +0100  tmodes  (76f04d672b03)  
+
+	Fixes call of make with MAKEFLAGS=-j2 [679164]
+
+	> src/hugin1/base_wx/RunStitchPanel.cpp
+
+2012-03-18 10:34 +0100  tmodes  (53a0b6890c37)  
+
+	Added missing linebreak
+
+	> src/tools/pto_gen.cpp
+
+2012-03-18 10:04 +0100  tmodes  (344134bcc4a1)  
+
+	Added option to load distortion and vignetting data from lens
+	database to pto_gen and PTBatcherGUI
+
+	> src/hugin1/hugin/xrc/batch_frame.xrc
+	> src/hugin1/ptbatcher/FindPanoDialog.cpp
+	> src/hugin1/ptbatcher/FindPanoDialog.h
+	> src/hugin_base/panodata/SrcPanoImage.cpp
+	> src/hugin_base/panodata/SrcPanoImage.h
+	> src/tools/pto_gen.cpp
+
+2012-03-18 09:05 +0100  tmodes  (e67ac7f2fba6)  
+
+	Updated default control point detector settings
+
+	> src/hugin1/icpfind/default.unix
+	> src/hugin1/icpfind/default.win
+
+2012-03-18 09:04 +0100  tmodes  (d82c6a3fc1c2)  
+
+	Cpfind: Add prealign matching strategy
+
+	> src/hugin_cpfind/cpfind/PanoDetector.cpp
+	> src/hugin_cpfind/cpfind/PanoDetector.h
+	> src/hugin_cpfind/cpfind/main.cpp
+
+2012-03-18 08:55 +0100  tmodes  (babf1fca3074)  
+
+	pano_modify: Add HDR autocrop
+
+	> src/tools/pano_modify.cpp
+
+2012-03-18 08:54 +0100  tmodes  (4c72337f3e85)  
+
+	Fixes encoding problem for batch queue file
+
+	> src/hugin1/ptbatcher/Batch.cpp
+
+2012-03-10 08:32 +0100  tmodes  (16fc1241520a)  
+
+	Improved writing of lensdata into database for compact cameras
+
+	> src/hugin1/base_wx/wxLensDB.cpp
+	> src/hugin1/hugin/xrc/lensdb_dialogs.xrc
+	> src/hugin_base/lensdb/LensDB.cpp
+	> src/hugin_base/lensdb/LensDB.h
+
+2012-03-09 19:26 +0100  tmodes  (8ae5c7953bd2)  
+
+	Some minor fixes for lensdb dialogs
+
+	> src/hugin1/base_wx/wxLensDB.cpp
+
+2012-03-08 21:02 +0100  tmodes  (6916593231ee)  
+
+	Fixes reading of data for compact camera from lensfun database
+
+	> src/hugin1/base_wx/wxLensDB.cpp
+	> src/hugin1/hugin/xrc/lensdb_dialogs.xrc
+	> src/hugin_base/lensdb/LensDB.cpp
+	> src/hugin_base/lensdb/LensDB.h
+	> src/hugin_base/panodata/SrcPanoImage.cpp
+
+2012-03-06 21:29 +0100  tmodes  (53c905b5907a)  
+
+	Use own splash screen This fixes the issue when pressing keys or do
+	mouse clicks on the splash can result in segmentation faults or
+	Hugin does not start [679270]
+

[Hugin-cvs] /hgroot/hugin/hugin: No translation changes but timestamp for ne...

From: <hugin-cvs@li...> - 2012-07-23 04:52

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/b5a1699d5b4c
changeset:  5900:b5a1699d5b4c
user:       harryvanderwolf <hvdwolf@...>
date:       Mon Jul 23 06:51:44 2012 +0200
description:

No translation changes but timestamp for next release

diffstat:

 src/translations/bg.po     |  2 +-
 src/translations/ca_ES.po  |  2 +-
 src/translations/cs_CZ.po  |  2 +-
 src/translations/da.po     |  2 +-
 src/translations/de.po     |  2 +-
 src/translations/en_GB.po  |  2 +-
 src/translations/es.po     |  2 +-
 src/translations/fi.po     |  2 +-
 src/translations/fr.po     |  2 +-
 src/translations/hu.po     |  2 +-
 src/translations/hugin.pot |  2 +-
 src/translations/it.po     |  2 +-
 src/translations/ja.po     |  2 +-
 src/translations/ko.po     |  2 +-
 src/translations/nl.po     |  2 +-
 src/translations/pl.po     |  2 +-
 src/translations/pt_BR.po  |  2 +-
 src/translations/ro.po     |  2 +-
 src/translations/ru.po     |  2 +-
 src/translations/sk.po     |  2 +-
 src/translations/sl.po     |  2 +-
 src/translations/sv.po     |  2 +-
 src/translations/uk.po     |  2 +-
 src/translations/zh_CN.po  |  2 +-
 src/translations/zh_TW.po  |  2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diffs (300 lines):

diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/bg.po
--- a/src/translations/bg.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/bg.po	Mon Jul 23 06:51:44 2012 +0200
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: bg\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2008-07-10 10:12+0200\n"
 "Last-Translator: Svetoslav Stefanov <lfu.project@..."
 "Language-Team: Bulgarian <bg@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/ca_ES.po
--- a/src/translations/ca_ES.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/ca_ES.po	Mon Jul 23 06:51:44 2012 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Hugin 0.5\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2005-11-10 18:48+0100\n"
 "Last-Translator: Albert Capellades Badia <albertcba@..."
 "Language-Team: Translation Project Catalan Team <albertcba@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/cs_CZ.po
--- a/src/translations/cs_CZ.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/cs_CZ.po	Mon Jul 23 06:51:44 2012 +0200
@@ -28,7 +28,7 @@
 msgstr ""
 "Project-Id-Version: cs_CZ\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-07-21 13:19+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2012-07-20 18:24+0100\n"
 "Last-Translator: Václav Černý <vatoz@..."
 "Language-Team: Čeština\n"
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/da.po
--- a/src/translations/da.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/da.po	Mon Jul 23 06:51:44 2012 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2012-05-08 10:33+0100\n"
 "Last-Translator: Thomas Pryds <thomas@..."
 "Language-Team: danish <da@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/de.po
--- a/src/translations/de.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/de.po	Mon Jul 23 06:51:44 2012 +0200
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2011-11-20 00:37+0100\n"
 "Last-Translator: Carl von Einem <carl@..."
 "Language-Team: deutsch <de@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/en_GB.po
--- a/src/translations/en_GB.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/en_GB.po	Mon Jul 23 06:51:44 2012 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: en_GB\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2011-02-28 15:18+0000\n"
 "Last-Translator: Gareth Jones <gareth.k.jones@..."
 "Language-Team: British English <en_GB@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/es.po
--- a/src/translations/es.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/es.po	Mon Jul 23 06:51:44 2012 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: hugin\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2012-04-23 22:31+0200\n"
 "Last-Translator: Jorge González <jorgegonz@..."
 "Language-Team: Español; Castellano <gnome-es-list@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/fi.po
--- a/src/translations/fi.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/fi.po	Mon Jul 23 06:51:44 2012 +0200
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: fi\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2010-06-17 12:45+0200\n"
 "Last-Translator: Juha Helminen <juha.helminen@..."
 "Language-Team:  <@>\n"
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/fr.po
--- a/src/translations/fr.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/fr.po	Mon Jul 23 06:51:44 2012 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Hugin 2011-4.0\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2011-11-06 16:10+0100\n"
 "Last-Translator: Jean-Luc Coulon <jean-luc.coulon@..."
 "Language-Team: French <kde-i18n-doc@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/hu.po
--- a/src/translations/hu.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/hu.po	Mon Jul 23 06:51:44 2012 +0200
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Hugin 2011.4.0\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2011-12-06 13:39+0100\n"
 "Last-Translator: Höss Lajos <pgc1682@..."
 "Language-Team: Balló György <ballogy@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/hugin.pot
--- a/src/translations/hugin.pot	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/hugin.pot	Mon Jul 23 06:51:44 2012 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@..."
 "Language-Team: LANGUAGE <LL@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/it.po
--- a/src/translations/it.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/it.po	Mon Jul 23 06:51:44 2012 +0200
@@ -35,7 +35,7 @@
 msgstr ""
 "Project-Id-Version: hugin 0.8\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2012-04-19 20:31+0100\n"
 "Last-Translator: Cristian Marchi <cri.penta@..."
 "Language-Team: Italian <tp@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/ja.po
--- a/src/translations/ja.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/ja.po	Mon Jul 23 06:51:44 2012 +0200
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: Hugin 2011.1.0.83a530eea793\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2011-05-15 18:59+0900\n"
 "Last-Translator: KITAGAWA, Masahiro <arctica0316@..."
 "Language-Team: 日本語 <ja@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/ko.po
--- a/src/translations/ko.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/ko.po	Mon Jul 23 06:51:44 2012 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: hugin\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2008-04-29 13:39+0900\n"
 "Last-Translator: homin,Lee <ff4500@..."
 "Language-Team: Gnome-kr-hackers <gnome-kr-hackers@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/nl.po
--- a/src/translations/nl.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/nl.po	Mon Jul 23 06:51:44 2012 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2012-01-17 17:30+0100\n"
 "Last-Translator: Harry van der Wolf <harryvanderwolf@..."
 "Language-Team: American English <kde-i18n-doc@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/pl.po
--- a/src/translations/pl.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/pl.po	Mon Jul 23 06:51:44 2012 +0200
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2010-03-29 09:28+0200\n"
 "Last-Translator: Michał Smoczyk <msmoczyk@..."
 "Language-Team: Polish <pl@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/pt_BR.po
--- a/src/translations/pt_BR.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/pt_BR.po	Mon Jul 23 06:51:44 2012 +0200
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2011-11-05 18:46-0200\n"
 "Last-Translator: Luís Henrique Camargo Quiroz <luishcq@..."
 "Language-Team: Brazilian Portuguese <kde-i18n-doc@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/ro.po
--- a/src/translations/ro.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/ro.po	Mon Jul 23 06:51:44 2012 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Hugin 0.8.0\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2011-01-19 14:51+0200\n"
 "Last-Translator: Mihai <mihaiv@..."
 "Language-Team:  <>\n"
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/ru.po
--- a/src/translations/ru.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/ru.po	Mon Jul 23 06:51:44 2012 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Hugin 2011.0.0\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2011-04-16 16:27+0400\n"
 "Last-Translator: Александр Прокудин <alexandre.prokoudine@..."
 "Language-Team: Russian <gnome-cyr@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/sk.po
--- a/src/translations/sk.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/sk.po	Mon Jul 23 06:51:44 2012 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: hugin\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2011-01-15 22:53+0100\n"
 "Last-Translator: Jozef Riha <jose1711@..."
 "Language-Team: Slovak <sk@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/sl.po
--- a/src/translations/sl.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/sl.po	Mon Jul 23 06:51:44 2012 +0200
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Slovenski prevod\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2009-02-17 22:25+0100\n"
 "Last-Translator: Zoran Mesec <zoran.mesec@..."
 "Language-Team: Zoran Mesec <zoran.mesec@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/sv.po
--- a/src/translations/sv.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/sv.po	Mon Jul 23 06:51:44 2012 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: se\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2011-09-29 13:15+0100\n"
 "Last-Translator: Ulf Wilhelmson <ulf.wilhelmson@..."
 "Language-Team: Svenska <se@..."
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/uk.po
--- a/src/translations/uk.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/uk.po	Mon Jul 23 06:51:44 2012 +0200
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Hugin 0.7\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2006-08-20 21:38+0200\n"
 "Last-Translator: Serhij Dubyk <dubyk@..."
 "Language-Team: \n"
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/zh_CN.po
--- a/src/translations/zh_CN.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/zh_CN.po	Mon Jul 23 06:51:44 2012 +0200
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: for Hugin\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: 2012-06-03 10:28+0800\n"
 "Last-Translator: Lu Fang\n"
 "Language-Team: Simplified Chinese <N/A>\n"
diff -r 139a81e90f96 -r b5a1699d5b4c src/translations/zh_TW.po
--- a/src/translations/zh_TW.po	Sat Jul 21 14:03:06 2012 +0200
+++ b/src/translations/zh_TW.po	Mon Jul 23 06:51:44 2012 +0200
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: for hugin 2011.2.0_rc5\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
-"POT-Creation-Date: 2012-06-26 21:21+0200\n"
+"POT-Creation-Date: 2012-07-23 06:47+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Ewing Kang <f039281310@..."
 "Language-Team: Chinese Traditional <NA>\n"

Next Messages