Project import/hugin - Diff 3c47153815...740edf9fa9

... ... --- a/.abf.yml
... ... +++ b/.abf.yml
... ... @@ -1,2 +1,3 @@
1 1
sources:
2
  hugin-2017.0.0.tar.bz2: 4ba7f5bf5afdadbea9cf10d15aa14e644ef94ed3
2
  hugin-2018.0.0.tar.bz2: bf62cc597015f8fcbddb52590fe3f8eac497449f
3
  hugin-2018.0.0_ru.tar.gz: a64577e3373b353344b096933a5c3c61e3000ddf
view file @ 3c47153815
... ... --- a/hugin-2016.2.0-l10n-ru.patch
... ... +++ /dev/null
... ... @@ -1,9351 +0,0 @@
0
diff -urN hugin-2016.2.0/src/translations/ru.po hugin-2016.2.0-patched/src/translations/ru.po
1
--- hugin-2016.2.0/src/translations/ru.po	2016-06-02 01:41:20.000000000 +1000
2
+++ hugin-2016.2.0-patched/src/translations/ru.po	2016-09-26 21:17:21.000000000 +1000
3
@@ -7,7 +7,7 @@
4
 msgstr ""
5
 "Project-Id-Version: Hugin 2011.0.0\n"
6
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n"
7
-"POT-Creation-Date: 2016-05-29 09:14+0200\n"
8
+"POT-Creation-Date: 2015-06-13 08:46+0200\n"
9
 "PO-Revision-Date: 2013-05-24 13:59+0400\n"
10
 "Last-Translator: Нежельский Виктор Андреевич <nezhelskiy@yandex.ru>\n"
11
 "Language-Team: Russian <gnome-cyr@lists.gnome.org>\n"
12
@@ -20,63 +20,56 @@
13
 "%100>=20) ? 1 : 2);\n"
14
 "X-Generator: Poedit 1.5.5\n"
15
 
16
-#: hugin1/base_wx/AssistantExecutor.cpp:69
17
-#: hugin1/hugin/PapywizardImport.cpp:460
18
-#, fuzzy
19
+#: hugin1/base_wx/AssistantExecutor.cpp:71
20
 msgid "Searching for control points..."
21
-msgstr "Очистить контрольные точки"
22
+msgstr "Поиск контрольных точек..."
23
 
24
-#: hugin1/base_wx/AssistantExecutor.cpp:81
25
-#, fuzzy
26
+#: hugin1/base_wx/AssistantExecutor.cpp:83
27
 msgid "Removing control points in clouds..."
28
-msgstr "Удалить контрольные точки из облаков"
29
+msgstr "Удаление контрольных точки из облаков..."
30
 
31
-#: hugin1/base_wx/AssistantExecutor.cpp:87
32
-#, fuzzy
33
+#: hugin1/base_wx/AssistantExecutor.cpp:89
34
 msgid "Statistically cleaning of control points..."
35
-msgstr "Выполняется классификация контрольных точек..."
36
+msgstr "Статистическая чистка контрольных точек..."
37
 
38
-#: hugin1/base_wx/AssistantExecutor.cpp:105
39
-#, fuzzy
40
+#: hugin1/base_wx/AssistantExecutor.cpp:107
41
 msgid "Searching for vertical lines..."
42
-msgstr "Определить вертикальные линии"
43
+msgstr "Поиск вертикальных линий..."
44
 
45
-#: hugin1/base_wx/AssistantExecutor.cpp:111
46
-#, fuzzy
47
+#: hugin1/base_wx/AssistantExecutor.cpp:113
48
 msgid "Optimizing..."
49
-msgstr "Идёт оптимизация"
50
+msgstr "Идёт оптимизация..."
51
 
52
-#: hugin1/base_wx/AssistantExecutor.cpp:120
53
-#, fuzzy
54
+#: hugin1/base_wx/AssistantExecutor.cpp:122
55
 msgid "Searching for best crop..."
56
-msgstr "Идёт поиск контрольных точек в участках, похожих на облака..."
57
+msgstr "Поиск оптимальной обрезки..."
58
 
59
-#: hugin1/base_wx/Executor.cpp:141 hugin1/base_wx/platform.cpp:131
60
-#: hugin1/hugin/MainFrame.cpp:1540 hugin1/hugin/MainFrame.cpp:2210
61
-#: hugin1/hugin/PanoPanel.cpp:1265
62
+#: hugin1/base_wx/Executor.cpp:132 hugin1/base_wx/platform.cpp:131
63
+#: hugin1/hugin/MainFrame.cpp:1479 hugin1/hugin/MainFrame.cpp:2131
64
+#: hugin1/hugin/PanoPanel.cpp:1225
65
 #, c-format
66
 msgid "External program %s not found in the bundle, reverting to system path"
67
 msgstr ""
68
 "Внешняя программа %s не найдена в поставке Hugin, возврат к системному пути"
69
 
70
-#: hugin1/base_wx/Executor.cpp:164 hugin1/base_wx/Executor.cpp:214
71
-#, fuzzy, c-format
72
+#: hugin1/base_wx/Executor.cpp:155 hugin1/base_wx/Executor.cpp:207
73
+#, c-format
74
 msgid ""
75
 "WARNING: External program %s not found as specified in preferences, "
76
 "reverting to bundled version"
77
 msgstr ""
78
-"Внешняя программа %s, указанная в параметрах, не найдена. Возврат к версии "
79
+"ВНИМАНИЕ: Внешняя программа %s, указанная в параметрах, не найдена. Возврат к версии "
80
 "из поставки Hugin."
81
 
82
-#: hugin1/base_wx/Executor.cpp:176 hugin1/base_wx/Executor.cpp:186
83
-#, fuzzy, c-format
84
+#: hugin1/base_wx/Executor.cpp:168 hugin1/base_wx/Executor.cpp:179
85
+#, c-format
86
 msgid ""
87
 "WARNING: External program %s not found in the bundle, reverting to system "
88
 "path"
89
 msgstr ""
90
-"Внешняя программа %s не найдена в поставке Hugin, возврат к системному пути"
91
+"ВНИМАНИЕ: Внешняя программа %s не найдена в поставке Hugin, возврат к системному пути"
92
 
93
-#: hugin1/base_wx/HFOVDialog.cpp:73
94
+#: hugin1/base_wx/HFOVDialog.cpp:76
95
 #, c-format
96
 msgid ""
97
 "No or only partial information about field of view was found in image file\n"
98
@@ -92,20 +85,20 @@
99
 "Укажите горизонтальное поле зрения (ГорПЗ) или фокусное расстояние и кроп-"
100
 "фактор."
101
 
102
-#: hugin1/base_wx/HFOVDialog.cpp:155
103
+#: hugin1/base_wx/HFOVDialog.cpp:158
104
 msgid "The horizontal field of view must be positive."
105
 msgstr "Значение горизонтального поля зрения должно быть положительным."
106
 
107
-#: hugin1/base_wx/HFOVDialog.cpp:207
108
+#: hugin1/base_wx/HFOVDialog.cpp:210
109
 msgid "The focal length must be positive."
110
 msgstr "Фокусное расстояние должно быть положительным."
111
 
112
-#: hugin1/base_wx/HFOVDialog.cpp:247
113
+#: hugin1/base_wx/HFOVDialog.cpp:250
114
 msgid "The crop factor must be positive."
115
 msgstr "Кроп-фактор должен быть положительным."
116
 
117
-#: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202
118
-#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:1790
119
+#: hugin1/base_wx/HFOVDialog.cpp:377 hugin1/hugin/ImageVariableDialog.cpp:204
120
+#: hugin1/hugin/ImagesPanel.cpp:558 hugin1/hugin/ImagesTree.cpp:1779
121
 #, c-format
122
 msgid ""
123
 "You have given a field of view of %.2f degrees.\n"
124
@@ -117,94 +110,92 @@
125
 "Однако ортографическая проекция ограничивается 180 градусами.\n"
126
 "Вы хотите по-прежнему использовать это завышенное значение?"
127
 
128
-#: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:464
129
-#: hugin1/base_wx/wxPanoCommand.cpp:553 hugin1/hugin/CPEditorPanel.cpp:1134
130
-#: hugin1/hugin/CPEditorPanel.cpp:1144 hugin1/hugin/CPEditorPanel.cpp:1159
131
-#: hugin1/hugin/CPEditorPanel.cpp:1172 hugin1/hugin/GLPreviewFrame.cpp:1890
132
-#: hugin1/hugin/GLPreviewFrame.cpp:1979 hugin1/hugin/GLPreviewFrame.cpp:3017
133
-#: hugin1/hugin/GLPreviewFrame.cpp:3379 hugin1/hugin/GLPreviewFrame.cpp:3390
134
-#: hugin1/hugin/GLPreviewFrame.cpp:3401
135
-#: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569
136
-#: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666
137
-#: hugin1/hugin/ImagesTree.cpp:1792 hugin1/hugin/MainFrame.cpp:700
138
-#: hugin1/hugin/MainFrame.cpp:972 hugin1/hugin/OptimizePanel.cpp:172
139
-#: hugin1/hugin/OptimizePhotometricPanel.cpp:149
140
-#: hugin1/hugin/PanoOperation.cpp:373 hugin1/hugin/PanoPanel.cpp:1613
141
-#: hugin1/hugin/PanoPanel.cpp:1643 hugin1/hugin/PanoPanel.cpp:1669
142
-#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1725
143
-#: hugin1/hugin/PanoPanel.cpp:1735 hugin1/hugin/PapywizardImport.cpp:343
144
-#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123
145
-#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255
146
-#: hugin1/hugin/xrc/pano_panel.xrc:1078
147
+#: hugin1/base_wx/HFOVDialog.cpp:379 hugin1/base_wx/LensTools.cpp:463
148
+#: hugin1/base_wx/wxPanoCommand.cpp:474 hugin1/hugin/CPEditorPanel.cpp:1108
149
+#: hugin1/hugin/CPEditorPanel.cpp:1118 hugin1/hugin/CPEditorPanel.cpp:1133
150
+#: hugin1/hugin/CPEditorPanel.cpp:1146 hugin1/hugin/GLPreviewFrame.cpp:1835
151
+#: hugin1/hugin/GLPreviewFrame.cpp:1924 hugin1/hugin/GLPreviewFrame.cpp:2958
152
+#: hugin1/hugin/GLPreviewFrame.cpp:3318 hugin1/hugin/GLPreviewFrame.cpp:3329
153
+#: hugin1/hugin/GLPreviewFrame.cpp:3340
154
+#: hugin1/hugin/ImageVariableDialog.cpp:206 hugin1/hugin/ImagesPanel.cpp:560
155
+#: hugin1/hugin/ImagesPanel.cpp:623 hugin1/hugin/ImagesPanel.cpp:657
156
+#: hugin1/hugin/ImagesTree.cpp:1781 hugin1/hugin/MainFrame.cpp:696
157
+#: hugin1/hugin/MainFrame.cpp:970 hugin1/hugin/OptimizePanel.cpp:174
158
+#: hugin1/hugin/OptimizePhotometricPanel.cpp:154
159
+#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1442
160
+#: hugin1/hugin/PanoPanel.cpp:1468 hugin1/hugin/PanoPanel.cpp:1503
161
+#: hugin1/hugin/PanoPanel.cpp:1524 hugin1/hugin/PanoPanel.cpp:1534
162
+#: translations/xrc.cpp:337 translations/xrc.cpp:341 translations/xrc.cpp:347
163
+#: translations/xrc.cpp:645
164
 msgid "Hugin"
165
 msgstr "Hugin"
166
 
167
-#: hugin1/base_wx/LensTools.cpp:38 hugin1/base_wx/LensTools.cpp:81
168
+#: hugin1/base_wx/LensTools.cpp:40 hugin1/base_wx/LensTools.cpp:83
169
 msgid "Normal (rectilinear)"
170
 msgstr "Нормальный (прямолинейный)"
171
 
172
-#: hugin1/base_wx/LensTools.cpp:39 hugin1/base_wx/LensTools.cpp:82
173
+#: hugin1/base_wx/LensTools.cpp:41 hugin1/base_wx/LensTools.cpp:84
174
 msgid "Panoramic (cylindrical)"
175
 msgstr "Панорамный (цилиндрический)"
176
 
177
-#: hugin1/base_wx/LensTools.cpp:40 hugin1/base_wx/LensTools.cpp:83
178
+#: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85
179
 msgid "Circular fisheye"
180
 msgstr "Круговой РыбийГлаз"
181
 
182
-#: hugin1/base_wx/LensTools.cpp:41 hugin1/base_wx/LensTools.cpp:84
183
+#: hugin1/base_wx/LensTools.cpp:43 hugin1/base_wx/LensTools.cpp:86
184
 msgid "Full frame fisheye"
185
 msgstr "Полнокадровый РыбийГлаз"
186
 
187
-#: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85
188
-#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1568
189
-#: hugin1/hugin/PreviewFrame.cpp:643
190
+#: hugin1/base_wx/LensTools.cpp:44 hugin1/base_wx/LensTools.cpp:87
191
+#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1536
192
+#: hugin1/hugin/PreviewFrame.cpp:647
193
 msgid "Equirectangular"
194
 msgstr "Эквидистантная"
195
 
196
-#: hugin1/base_wx/LensTools.cpp:43 hugin1/base_wx/LensTools.cpp:86
197
-#: hugin1/hugin/PanoPanel.cpp:154
198
+#: hugin1/base_wx/LensTools.cpp:45 hugin1/base_wx/LensTools.cpp:88
199
+#: hugin1/hugin/PanoPanel.cpp:157
200
 msgid "Orthographic"
201
 msgstr "Ортографическая"
202
 
203
-#: hugin1/base_wx/LensTools.cpp:44 hugin1/base_wx/LensTools.cpp:87
204
-#: hugin1/hugin/PanoPanel.cpp:144
205
+#: hugin1/base_wx/LensTools.cpp:46 hugin1/base_wx/LensTools.cpp:89
206
+#: hugin1/hugin/PanoPanel.cpp:147
207
 msgid "Stereographic"
208
 msgstr "Стереографическая"
209
 
210
-#: hugin1/base_wx/LensTools.cpp:45 hugin1/base_wx/LensTools.cpp:88
211
-#: hugin1/hugin/PanoPanel.cpp:155
212
+#: hugin1/base_wx/LensTools.cpp:47 hugin1/base_wx/LensTools.cpp:90
213
+#: hugin1/hugin/PanoPanel.cpp:158
214
 msgid "Equisolid"
215
 msgstr "Равноцельная"
216
 
217
-#: hugin1/base_wx/LensTools.cpp:46 hugin1/base_wx/LensTools.cpp:89
218
+#: hugin1/base_wx/LensTools.cpp:48 hugin1/base_wx/LensTools.cpp:91
219
 msgid "Fisheye Thoby"
220
 msgstr "РыбийГлаз Thoby"
221
 
222
-#: hugin1/base_wx/LensTools.cpp:53 hugin1/hugin/xrc/pano_panel.xrc:818
223
+#: hugin1/base_wx/LensTools.cpp:55 translations/xrc.cpp:620
224
 msgid "enblend"
225
 msgstr "сведение"
226
 
227
-#: hugin1/base_wx/LensTools.cpp:54 hugin1/hugin/xrc/pano_panel.xrc:791
228
+#: hugin1/base_wx/LensTools.cpp:56 translations/xrc.cpp:617
229
 msgid "builtin"
230
 msgstr "встроенное"
231
 
232
-#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559
233
+#: hugin1/base_wx/LensTools.cpp:102 translations/xrc.cpp:214
234
 msgid "custom (EMoR)"
235
 msgstr "Другой (EMoR)"
236
 
237
-#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560
238
+#: hugin1/base_wx/LensTools.cpp:105 translations/xrc.cpp:215
239
 msgid "Linear"
240
 msgstr "Линейный"
241
 
242
-#: hugin1/base_wx/LensTools.cpp:264
243
+#: hugin1/base_wx/LensTools.cpp:263
244
 msgid "Load lens parameters"
245
 msgstr "Загрузить параметры объектива"
246
 
247
-#: hugin1/base_wx/LensTools.cpp:266
248
+#: hugin1/base_wx/LensTools.cpp:265
249
 msgid "Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*"
250
 msgstr "Файлы данных объектива (*.ini)|*.ini|Все файлы (*.*)|*.*"
251
 
252
-#: hugin1/base_wx/LensTools.cpp:287
253
+#: hugin1/base_wx/LensTools.cpp:286
254
 msgid ""
255
 "Incompatible lens parameter file, image sizes do not match\n"
256
 "Apply settings anyway?"
257
@@ -213,37 +204,37 @@
258
 "размеры снимков не совпадают\n"
259
 "Всё равно применить параметры?"
260
 
261
-#: hugin1/base_wx/LensTools.cpp:287
262
+#: hugin1/base_wx/LensTools.cpp:286
263
 msgid "Error loading lens parameters"
264
 msgstr "Ошибка загрузки параметров объектива"
265
 
266
-#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:689
267
+#: hugin1/base_wx/LensTools.cpp:389 hugin1/calibrate_lens/LensCalFrame.cpp:691
268
 msgid "Save lens parameters file"
269
 msgstr "Сохранить файл параметров объектива"
270
 
271
-#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:691
272
+#: hugin1/base_wx/LensTools.cpp:391 hugin1/calibrate_lens/LensCalFrame.cpp:693
273
 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*"
274
 msgstr "Файлы данных объектива (*.ini)|*.ini|Все файлы (*)|*"
275
 
276
-#: hugin1/base_wx/LensTools.cpp:407 hugin1/calibrate_lens/LensCalFrame.cpp:702
277
-#: hugin1/calibrate_lens/LensCalFrame.cpp:767
278
-#: hugin1/hugin/ImageVariableDialog.cpp:350 hugin1/hugin/MainFrame.cpp:835
279
-#: hugin1/hugin/MaskEditorPanel.cpp:466
280
+#: hugin1/base_wx/LensTools.cpp:406 hugin1/calibrate_lens/LensCalFrame.cpp:704
281
+#: hugin1/calibrate_lens/LensCalFrame.cpp:769
282
+#: hugin1/hugin/ImageVariableDialog.cpp:352 hugin1/hugin/MainFrame.cpp:833
283
+#: hugin1/hugin/MaskEditorPanel.cpp:452
284
 #, c-format
285
 msgid "File %s exists. Overwrite?"
286
 msgstr "Файл %s уже существует. Перезаписать?"
287
 
288
-#: hugin1/base_wx/LensTools.cpp:408 hugin1/calibrate_lens/LensCalFrame.cpp:703
289
-#: hugin1/calibrate_lens/LensCalFrame.cpp:768 hugin1/hugin/MainFrame.cpp:836
290
-#: hugin1/hugin/xrc/main_tool.xrc:19
291
+#: hugin1/base_wx/LensTools.cpp:407 hugin1/calibrate_lens/LensCalFrame.cpp:705
292
+#: hugin1/calibrate_lens/LensCalFrame.cpp:770 hugin1/hugin/MainFrame.cpp:834
293
+#: translations/xrc.cpp:446
294
 msgid "Save project"
295
 msgstr "Сохранить проект"
296
 
297
-#: hugin1/base_wx/LensTools.cpp:420
298
+#: hugin1/base_wx/LensTools.cpp:419
299
 msgid "Please select an image and try again"
300
 msgstr "Выберите снимок и попробуйте ещё раз"
301
 
302
-#: hugin1/base_wx/LensTools.cpp:462
303
+#: hugin1/base_wx/LensTools.cpp:461
304
 msgid ""
305
 "This project contains stacks with linked positions. But the lens parameters "
306
 "are not linked for these images.\n"
307
@@ -251,37 +242,30 @@
308
 "Please check and correct this before proceeding."
309
 msgstr ""
310
 
311
-#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:122
312
+#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:124
313
 #, c-format
314
 msgid "Failed to kill process %ld, error %d: %s"
315
 msgstr "Не удалось убрать процесс %ld, ошибка %d: %s"
316
 
317
-#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:140
318
+#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:143
319
 #, c-format
320
 msgid "Error pausing process %ld, code 1"
321
 msgstr "Ошибка приостановки процесса %ld, код 1"
322
 
323
-#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:157
324
+#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:160
325
 #, c-format
326
 msgid "Error pausing process %ld, code 2"
327
 msgstr "Ошибка приостановки процесса %ld, код 2"
328
 
329
-#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:548
330
+#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:551
331
 #: hugin1/ptbatcher/RunStitchFrame.cpp:43
332
-#: hugin1/stitch_project/hugin_stitch_project.cpp:111
333
-#: hugin1/hugin/xrc/cpdetector_dialog.xrc:334
334
-#: hugin1/hugin/xrc/image_variable_dlg.xrc:640
335
-#: hugin1/hugin/xrc/image_variable_dlg.xrc:711
336
-#: hugin1/hugin/xrc/images_panel.xrc:553
337
-#: hugin1/hugin/xrc/lensdb_dialogs.xrc:146
338
-#: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408
339
-#: hugin1/hugin/xrc/mask_editor_panel.xrc:505
340
-#: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97
341
-#: hugin1/hugin/xrc/pano_panel.xrc:139 hugin1/hugin/xrc/pano_panel.xrc:1013
342
-#: hugin1/hugin/xrc/pano_panel.xrc:1339 hugin1/hugin/xrc/pano_panel.xrc:1388
343
-#: hugin1/hugin/xrc/pref_dialog.xrc:1515 hugin1/hugin/xrc/pref_dialog.xrc:1556
344
-#: hugin1/hugin/xrc/pref_dialog.xrc:1615 hugin1/hugin/xrc/preview_frame.xrc:115
345
-#: hugin1/hugin/xrc/reset_dialog.xrc:122
346
+#: hugin1/stitch_project/hugin_stitch_project.cpp:116 translations/xrc.cpp:172
347
+#: translations/xrc.cpp:220 translations/xrc.cpp:228 translations/xrc.cpp:264
348
+#: translations/xrc.cpp:308 translations/xrc.cpp:322 translations/xrc.cpp:517
349
+#: translations/xrc.cpp:550 translations/xrc.cpp:554 translations/xrc.cpp:558
350
+#: translations/xrc.cpp:641 translations/xrc.cpp:666 translations/xrc.cpp:831
351
+#: translations/xrc.cpp:835 translations/xrc.cpp:839 translations/xrc.cpp:863
352
+#: translations/xrc.cpp:1099
353
 msgid "Cancel"
354
 msgstr "Отмена"
355
 
356
@@ -291,23 +275,20 @@
357
 msgstr "Очистить контрольные точки"
358
 
359
 #: hugin1/base_wx/MyProgressDialog.cpp:36
360
-#, fuzzy
361
 msgid "Loading image:"
362
-msgstr "Загружаются снимки"
363
+msgstr "Загружается снимок:"
364
 
365
 #: hugin1/base_wx/MyProgressDialog.cpp:37
366
-#, fuzzy
367
 msgid "Scaling image:"
368
-msgstr "Масштабируется снимок %s"
369
+msgstr "Масштабируется снимок:"
370
 
371
 #: hugin1/base_wx/MyProgressDialog.cpp:38
372
 msgid "sampling points"
373
 msgstr ""
374
 
375
 #: hugin1/base_wx/MyProgressDialog.cpp:39
376
-#, fuzzy
377
 msgid "extracting good points"
378
-msgstr "Создать контрольные точки"
379
+msgstr "извлечение хороших точек"
380
 
381
 #: hugin1/base_wx/MyProgressDialog.cpp:40
382
 msgid "Elapsed time: "
383
@@ -318,47 +299,42 @@
384
 msgid "Panorama Tools"
385
 msgstr "Panorama Tools"
386
 
387
-#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260
388
+#: hugin1/base_wx/RunStitchPanel.cpp:105 hugin1/base_wx/RunStitchPanel.cpp:244
389
 msgid "Could not open project file:"
390
 msgstr "Не удалось открыть файл проекта:"
391
 
392
-#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272
393
-#: hugin1/ptbatcher/ProjectArray.cpp:89
394
+#: hugin1/base_wx/RunStitchPanel.cpp:115 hugin1/base_wx/RunStitchPanel.cpp:252
395
+#: hugin1/ptbatcher/ProjectArray.cpp:91
396
 #, c-format
397
 msgid "could not open script: %s"
398
 msgstr "не удалось открыть скрипт: %s"
399
 
400
-#: hugin1/base_wx/RunStitchPanel.cpp:120
401
+#: hugin1/base_wx/RunStitchPanel.cpp:125
402
 #, c-format
403
 msgid "Project %s does not contain any active images."
404
-msgstr ""
405
+msgstr "Проект %s не содержит активных снимков."
406
 
407
-#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280
408
-#: hugin1/ptbatcher/ProjectArray.cpp:126
409
+#: hugin1/base_wx/RunStitchPanel.cpp:141 hugin1/base_wx/RunStitchPanel.cpp:260
410
+#: hugin1/ptbatcher/ProjectArray.cpp:128
411
 #, c-format
412
 msgid "error while parsing panotools script: %s"
413
 msgstr "ошибка при синтаксическом разборе скрипта panotools: %s"
414
 
415
-#: hugin1/base_wx/RunStitchPanel.cpp:146
416
-#, c-format
417
-msgid "Can't open user defined output sequence \"%s\"."
418
-msgstr ""
419
-
420
-#: hugin1/base_wx/RunStitchPanel.cpp:182
421
+#: hugin1/base_wx/RunStitchPanel.cpp:174
422
 msgid "Could not create temporary file"
423
 msgstr "Не удалось создать временный файл"
424
 
425
-#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302
426
+#: hugin1/base_wx/RunStitchPanel.cpp:194 hugin1/base_wx/RunStitchPanel.cpp:282
427
 msgid "Queue is empty. This should never happen."
428
-msgstr ""
429
+msgstr "Очередь пуста. Этого никогда не должно происходить."
430
 
431
-#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244
432
-#: hugin1/base_wx/RunStitchPanel.cpp:250
433
-#: hugin1/stitch_project/hugin_stitch_project.cpp:163
434
+#: hugin1/base_wx/RunStitchPanel.cpp:194 hugin1/base_wx/RunStitchPanel.cpp:228
435
+#: hugin1/base_wx/RunStitchPanel.cpp:234
436
+#: hugin1/stitch_project/hugin_stitch_project.cpp:168
437
 msgid "Error during stitching"
438
 msgstr "Ошибка в процессе сборки"
439
 
440
-#: hugin1/base_wx/RunStitchPanel.cpp:228
441
+#: hugin1/base_wx/RunStitchPanel.cpp:212
442
 msgid ""
443
 "Overwrite existing images?\n"
444
 "\n"
445
@@ -366,11 +342,11 @@
446
 "Перезаписать существующие снимки?\n"
447
 "\n"
448
 
449
-#: hugin1/base_wx/RunStitchPanel.cpp:228
450
+#: hugin1/base_wx/RunStitchPanel.cpp:212
451
 msgid "Overwrite existing images"
452
 msgstr "Перезаписать существующие снимки"
453
 
454
-#: hugin1/base_wx/RunStitchPanel.cpp:243
455
+#: hugin1/base_wx/RunStitchPanel.cpp:227
456
 #, c-format
457
 msgid ""
458
 "Error while stitching project\n"
459
@@ -379,12 +355,12 @@
460
 "Ошибка при сборке проекта\n"
461
 "%s"
462
 
463
-#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308
464
-#: hugin1/base_wx/RunStitchPanel.cpp:315
465
+#: hugin1/base_wx/RunStitchPanel.cpp:282 hugin1/base_wx/RunStitchPanel.cpp:288
466
+#: hugin1/base_wx/RunStitchPanel.cpp:295
467
 msgid "Error during running assistant"
468
 msgstr "Ошибка при работе ассистента"
469
 
470
-#: hugin1/base_wx/RunStitchPanel.cpp:307
471
+#: hugin1/base_wx/RunStitchPanel.cpp:287
472
 #, c-format
473
 msgid ""
474
 "Error while running assistant\n"
475
@@ -393,270 +369,247 @@
476
 "Ошибка при работе ассистента\n"
477
 "%s"
478
 
479
-#: hugin1/base_wx/StitchingExecutor.cpp:216
480
-#, fuzzy
481
+#: hugin1/base_wx/StitchingExecutor.cpp:208
482
 msgid "Stitching panorama..."
483
-msgstr "Сшивается панорама"
484
+msgstr "Сшивается панорама..."
485
 
486
-#: hugin1/base_wx/StitchingExecutor.cpp:219
487
+#: hugin1/base_wx/StitchingExecutor.cpp:211
488
 msgid "Platform:"
489
-msgstr ""
490
+msgstr "Платформа:"
491
 
492
-#: hugin1/base_wx/StitchingExecutor.cpp:220
493
-#, fuzzy
494
+#: hugin1/base_wx/StitchingExecutor.cpp:212
495
 msgid "Version:"
496
-msgstr "Версия: %s"
497
+msgstr "Версия:"
498
 
499
-#: hugin1/base_wx/StitchingExecutor.cpp:221
500
-#, fuzzy
501
+#: hugin1/base_wx/StitchingExecutor.cpp:213
502
 msgid "Working directory:"
503
-msgstr ""
504
-"\n"
505
-" текущий каталог:"
506
+msgstr "Текущий каталог:"
507
 
508
-#: hugin1/base_wx/StitchingExecutor.cpp:222
509
-#, fuzzy
510
+#: hugin1/base_wx/StitchingExecutor.cpp:214
511
 msgid "Output prefix:"
512
-msgstr "Префикс вывода"
513
+msgstr "Префикс вывода:"
514
 
515
-#: hugin1/base_wx/StitchingExecutor.cpp:234
516
-#: hugin1/base_wx/StitchingExecutor.cpp:238
517
-#: hugin1/base_wx/StitchingExecutor.cpp:244
518
-#: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:809
519
+#: hugin1/base_wx/StitchingExecutor.cpp:226
520
+#: hugin1/base_wx/StitchingExecutor.cpp:230
521
+#: hugin1/base_wx/StitchingExecutor.cpp:235 translations/xrc.cpp:51
522
+#: translations/xrc.cpp:619
523
 msgid "Blender:"
524
 msgstr "Совмещение:"
525
 
526
-#: hugin1/base_wx/StitchingExecutor.cpp:238
527
+#: hugin1/base_wx/StitchingExecutor.cpp:230
528
 msgid "Unknown blender (enblend --version failed)"
529
 msgstr ""
530
 
531
-#: hugin1/base_wx/StitchingExecutor.cpp:244
532
+#: hugin1/base_wx/StitchingExecutor.cpp:235
533
 #, fuzzy
534
 msgid "internal"
535
 msgstr "Внутренняя ошибка"
536
 
537
-#: hugin1/base_wx/StitchingExecutor.cpp:253
538
-#: hugin1/base_wx/StitchingExecutor.cpp:257
539
+#: hugin1/base_wx/StitchingExecutor.cpp:244
540
+#: hugin1/base_wx/StitchingExecutor.cpp:248
541
 #, fuzzy
542
 msgid "Exposure fusion:"
543
 msgstr "Экспозиция:"
544
 
545
-#: hugin1/base_wx/StitchingExecutor.cpp:257
546
+#: hugin1/base_wx/StitchingExecutor.cpp:248
547
 msgid "Unknown exposure fusion (enfuse --version failed)"
548
 msgstr ""
549
 
550
-#: hugin1/base_wx/StitchingExecutor.cpp:265
551
-#, fuzzy
552
+#: hugin1/base_wx/StitchingExecutor.cpp:256
553
 msgid "ExifTool version:"
554
-msgstr "Опции Enfuse"
555
+msgstr "Версия ExifTool:"
556
 
557
-#: hugin1/base_wx/StitchingExecutor.cpp:270
558
-#, fuzzy
559
+#: hugin1/base_wx/StitchingExecutor.cpp:261
560
 msgid "ExifTool:"
561
-msgstr "Опции Enfuse"
562
+msgstr "ExifTool:"
563
 
564
-#: hugin1/base_wx/StitchingExecutor.cpp:270
565
+#: hugin1/base_wx/StitchingExecutor.cpp:261
566
 msgid "FAILED"
567
-msgstr ""
568
+msgstr "ОШИБКА"
569
 
570
-#: hugin1/base_wx/StitchingExecutor.cpp:276
571
-#, fuzzy
572
+#: hugin1/base_wx/StitchingExecutor.cpp:267
573
 msgid "Number of active images:"
574
-msgstr "Число точек на снимок:"
575
+msgstr "Число активных снимков:"
576
 
577
-#: hugin1/base_wx/StitchingExecutor.cpp:277
578
+#: hugin1/base_wx/StitchingExecutor.cpp:268
579
 #, fuzzy, c-format
580
 msgid "Output exposure value: %.1f"
581
 msgstr "Слой совмещенных экспозиций %d"
582
 
583
-#: hugin1/base_wx/StitchingExecutor.cpp:278
584
-#, fuzzy, c-format
585
+#: hugin1/base_wx/StitchingExecutor.cpp:269
586
+#, c-format
587
 msgid "Canvas size: %dx%d"
588
-msgstr "Размер холста:"
589
+msgstr "Размер холста: %dx%d"
590
 
591
-#: hugin1/base_wx/StitchingExecutor.cpp:279
592
+#: hugin1/base_wx/StitchingExecutor.cpp:270
593
 #, c-format
594
 msgid "ROI: (%d, %d) - (%d, %d)"
595
 msgstr ""
596
 
597
-#: hugin1/base_wx/StitchingExecutor.cpp:280
598
+#: hugin1/base_wx/StitchingExecutor.cpp:271
599
 #, c-format
600
 msgid "FOV: %.0fx%.0f"
601
 msgstr ""
602
 
603
-#: hugin1/base_wx/StitchingExecutor.cpp:286
604
-#: hugin1/base_wx/StitchingExecutor.cpp:292
605
-#: hugin1/base_wx/StitchingExecutor.cpp:359 hugin1/hugin/xrc/pano_panel.xrc:166
606
+#: hugin1/base_wx/StitchingExecutor.cpp:277
607
+#: hugin1/base_wx/StitchingExecutor.cpp:283
608
+#: hugin1/base_wx/StitchingExecutor.cpp:350 translations/xrc.cpp:560
609
 msgid "Projection:"
610
 msgstr "Проекция:"
611
 
612
-#: hugin1/base_wx/StitchingExecutor.cpp:295
613
-#, fuzzy
614
+#: hugin1/base_wx/StitchingExecutor.cpp:286
615
 msgid "Using GPU for remapping:"
616
-msgstr "Использовать GPU для переделки (ЭКСПЕРИМЕНТАЛЬНО)"
617
+msgstr "Использовать GPU для переделки:"
618
 
619
-#: hugin1/base_wx/StitchingExecutor.cpp:295
620
+#: hugin1/base_wx/StitchingExecutor.cpp:286
621
 msgid "true"
622
 msgstr ""
623
 
624
-#: hugin1/base_wx/StitchingExecutor.cpp:295
625
+#: hugin1/base_wx/StitchingExecutor.cpp:286
626
 msgid "false"
627
 msgstr ""
628
 
629
-#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:445
630
+#: hugin1/base_wx/StitchingExecutor.cpp:290 translations/xrc.cpp:580
631
 msgid "Panorama Outputs:"
632
 msgstr "Выводы панорамы:"
633
 
634
-#: hugin1/base_wx/StitchingExecutor.cpp:302
635
-#: hugin1/base_wx/StitchingExecutor.cpp:323 hugin1/hugin/xrc/pano_panel.xrc:460
636
-#: hugin1/hugin/xrc/pano_panel.xrc:622 hugin1/hugin/xrc/pano_panel.xrc:1245
637
+#: hugin1/base_wx/StitchingExecutor.cpp:293
638
+#: hugin1/base_wx/StitchingExecutor.cpp:314 translations/xrc.cpp:581
639
+#: translations/xrc.cpp:596 translations/xrc.cpp:655
640
 msgid "Exposure corrected, low dynamic range"
641
 msgstr "Коррекция экспозиции, узкий динамический диапазон"
642
 
643
-#: hugin1/base_wx/StitchingExecutor.cpp:306 hugin1/hugin/xrc/pano_panel.xrc:472
644
-#: hugin1/hugin/xrc/pano_panel.xrc:1260
645
+#: hugin1/base_wx/StitchingExecutor.cpp:297 translations/xrc.cpp:583
646
+#: translations/xrc.cpp:657
647
 msgid "Exposure fused from stacks"
648
 msgstr "Сначала сведение экспозиций, затем объединение"
649
 
650
-#: hugin1/base_wx/StitchingExecutor.cpp:310 hugin1/hugin/xrc/pano_panel.xrc:481
651
-#: hugin1/hugin/xrc/pano_panel.xrc:1274
652
+#: hugin1/base_wx/StitchingExecutor.cpp:301 translations/xrc.cpp:585
653
+#: translations/xrc.cpp:659
654
 msgid "Exposure fused from any arrangement"
655
 msgstr "Сначала объединение, затем сведение экспозиций "
656
 
657
-#: hugin1/base_wx/StitchingExecutor.cpp:314
658
-#: hugin1/base_wx/StitchingExecutor.cpp:331
659
-#: hugin1/base_wx/StitchingExecutor.cpp:344 hugin1/hugin/xrc/pano_panel.xrc:549
660
-#: hugin1/hugin/xrc/pano_panel.xrc:642 hugin1/hugin/xrc/pano_panel.xrc:1288
661
+#: hugin1/base_wx/StitchingExecutor.cpp:305
662
+#: hugin1/base_wx/StitchingExecutor.cpp:322
663
+#: hugin1/base_wx/StitchingExecutor.cpp:335 translations/xrc.cpp:590
664
+#: translations/xrc.cpp:600 translations/xrc.cpp:661
665
 msgid "High dynamic range"
666
 msgstr "Широкий динамический диапазон"
667
 
668
-#: hugin1/base_wx/StitchingExecutor.cpp:320 hugin1/hugin/xrc/pano_panel.xrc:607
669
+#: hugin1/base_wx/StitchingExecutor.cpp:311 translations/xrc.cpp:595
670
 msgid "Remapped Images:"
671
 msgstr "Переделанные снимки:"
672
 
673
-#: hugin1/base_wx/StitchingExecutor.cpp:327 hugin1/hugin/xrc/pano_panel.xrc:633
674
+#: hugin1/base_wx/StitchingExecutor.cpp:318 translations/xrc.cpp:598
675
 msgid "No exposure correction, low dynamic range"
676
 msgstr "Без экспокоррекции, узкий динамический диапазон"
677
 
678
-#: hugin1/base_wx/StitchingExecutor.cpp:337 hugin1/hugin/xrc/pano_panel.xrc:652
679
+#: hugin1/base_wx/StitchingExecutor.cpp:328 translations/xrc.cpp:602
680
 msgid "Combined stacks:"
681
 msgstr "Сведённые стопки:"
682
 
683
-#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:667
684
+#: hugin1/base_wx/StitchingExecutor.cpp:331 translations/xrc.cpp:603
685
 msgid "Exposure fused stacks"
686
 msgstr "Стопки с различными экспозициями"
687
 
688
-#: hugin1/base_wx/StitchingExecutor.cpp:350 hugin1/hugin/xrc/pano_panel.xrc:687
689
+#: hugin1/base_wx/StitchingExecutor.cpp:341 translations/xrc.cpp:607
690
 msgid "Layers:"
691
 msgstr "Слои:"
692
 
693
-#: hugin1/base_wx/StitchingExecutor.cpp:351 hugin1/hugin/xrc/pano_panel.xrc:702
694
+#: hugin1/base_wx/StitchingExecutor.cpp:342 translations/xrc.cpp:608
695
 msgid "Blended layers of similar exposure, without exposure correction"
696
 msgstr "Совмещённые слои со схожей экспозицией без экспокоррекции"
697
 
698
-#: hugin1/base_wx/StitchingExecutor.cpp:355
699
+#: hugin1/base_wx/StitchingExecutor.cpp:346
700
 #, fuzzy
701
 msgid "First input image"
702
-msgstr "первый снимок"
703
+msgstr "Первый снимок"
704
 
705
-#: hugin1/base_wx/StitchingExecutor.cpp:356
706
-#, fuzzy
707
+#: hugin1/base_wx/StitchingExecutor.cpp:347
708
 msgid "Number:"
709
-msgstr "Количество процессоров:"
710
+msgstr "Количество:"
711
 
712
-#: hugin1/base_wx/StitchingExecutor.cpp:357
713
+#: hugin1/base_wx/StitchingExecutor.cpp:348
714
 msgid "Filename:"
715
 msgstr "Имя файла:"
716
 
717
-#: hugin1/base_wx/StitchingExecutor.cpp:358
718
-#, fuzzy, c-format
719
+#: hugin1/base_wx/StitchingExecutor.cpp:349
720
+#, c-format
721
 msgid "Size: %dx%d"
722
-msgstr "Размер холста:"
723
+msgstr "Размер: %dx%d"
724
 
725
-#: hugin1/base_wx/StitchingExecutor.cpp:360
726
-#, fuzzy
727
+#: hugin1/base_wx/StitchingExecutor.cpp:351
728
 msgid "Response type:"
729
-msgstr "Тип отклика"
730
+msgstr "Тип отклика:"
731
 
732
-#: hugin1/base_wx/StitchingExecutor.cpp:361
733
+#: hugin1/base_wx/StitchingExecutor.cpp:352
734
 #, c-format
735
 msgid "HFOV: %.0f"
736
 msgstr ""
737
 
738
-#: hugin1/base_wx/StitchingExecutor.cpp:362
739
-#, fuzzy, c-format
740
+#: hugin1/base_wx/StitchingExecutor.cpp:353
741
+#, c-format
742
 msgid "Exposure value: %.1f"
743
-msgstr "Экспозиция (Eev)"
744
+msgstr "Значение экспозиции: %.1f"
745
 
746
-#: hugin1/base_wx/StitchingExecutor.cpp:665
747
+#: hugin1/base_wx/StitchingExecutor.cpp:548
748
 msgid "Remapping and blending LDR images..."
749
-msgstr ""
750
+msgstr "Переделка и совмещение снимков LDR..."
751
 
752
-#: hugin1/base_wx/StitchingExecutor.cpp:676
753
-#, fuzzy
754
+#: hugin1/base_wx/StitchingExecutor.cpp:559
755
 msgid "Remapping LDR images..."
756
-msgstr "Переделанные снимки:"
757
+msgstr "Переделка снимков LDR..."
758
 
759
-#: hugin1/base_wx/StitchingExecutor.cpp:685
760
-#, fuzzy
761
+#: hugin1/base_wx/StitchingExecutor.cpp:569
762
 msgid "Blending images..."
763
-msgstr "Объединение снимков"
764
+msgstr "Совмещение снимков..."
765
 
766
-#: hugin1/base_wx/StitchingExecutor.cpp:733
767
+#: hugin1/base_wx/StitchingExecutor.cpp:612
768
 msgid "Remapping LDR images and blending exposure layers..."
769
-msgstr ""
770
+msgstr "Переделка снимков LDR и совмещение слоев экспозиций..."
771
 
772
-#: hugin1/base_wx/StitchingExecutor.cpp:751
773
-#, fuzzy
774
+#: hugin1/base_wx/StitchingExecutor.cpp:630
775
 msgid "Remapping LDR images without exposure correction..."
776
-msgstr "Совмещённые слои со схожей экспозицией без экспокоррекции"
777
+msgstr "Переделка снимков LDR без экспокоррекции"
778
 
779
-#: hugin1/base_wx/StitchingExecutor.cpp:770
780
-#, fuzzy, c-format
781
+#: hugin1/base_wx/StitchingExecutor.cpp:651
782
+#: hugin1/base_wx/StitchingExecutor.cpp:656
783
+#, c-format
784
 msgid "Blending exposure layer %u..."
785
-msgstr "Слой совмещенных экспозиций %d"
786
+msgstr "Совмещение слоя экспозиции %u..."
787
 
788
-#: hugin1/base_wx/StitchingExecutor.cpp:788
789
+#: hugin1/base_wx/StitchingExecutor.cpp:677
790
 msgid "Fusing all exposure layers..."
791
 msgstr ""
792
 
793
-#: hugin1/base_wx/StitchingExecutor.cpp:809
794
+#: hugin1/base_wx/StitchingExecutor.cpp:698
795
 #, fuzzy, c-format
796
 msgid "Fusing stack number %u..."
797
 msgstr "Присвоенный номер стопки"
798
 
799
-#: hugin1/base_wx/StitchingExecutor.cpp:829
800
-#: hugin1/base_wx/StitchingExecutor.cpp:839
801
+#: hugin1/base_wx/StitchingExecutor.cpp:719
802
+#: hugin1/base_wx/StitchingExecutor.cpp:728
803
 msgid "Blending all stacks..."
804
-msgstr ""
805
+msgstr "Совмещение всех стопок..."
806
 
807
-#: hugin1/base_wx/StitchingExecutor.cpp:856
808
-#, fuzzy
809
+#: hugin1/base_wx/StitchingExecutor.cpp:745
810
 msgid "Remapping HDR images..."
811
-msgstr "Переделанные снимки:"
812
+msgstr "Переделка снимков HDR..."
813
 
814
-#: hugin1/base_wx/StitchingExecutor.cpp:878
815
+#: hugin1/base_wx/StitchingExecutor.cpp:767
816
 #, fuzzy, c-format
817
 msgid "Merging HDR stack number %u..."
818
 msgstr "Присвоенный номер стопки"
819
 
820
-#: hugin1/base_wx/StitchingExecutor.cpp:892
821
-#: hugin1/base_wx/StitchingExecutor.cpp:898
822
+#: hugin1/base_wx/StitchingExecutor.cpp:782
823
+#: hugin1/base_wx/StitchingExecutor.cpp:786
824
 msgid "Blending HDR stacks..."
825
-msgstr ""
826
+msgstr "Совмещение стопок HDR..."
827
 
828
-#: hugin1/base_wx/StitchingExecutor.cpp:924
829
-#: hugin1/base_wx/StitchingExecutor.cpp:932
830
-#: hugin1/base_wx/StitchingExecutor.cpp:948
831
-#: hugin1/base_wx/StitchingExecutor.cpp:956
832
+#: hugin1/base_wx/StitchingExecutor.cpp:803
833
+#: hugin1/base_wx/StitchingExecutor.cpp:809
834
 msgid "Updating metadata..."
835
-msgstr ""
836
-
837
-#: hugin1/base_wx/StitchingExecutor.cpp:1036
838
-#: hugin1/base_wx/StitchingExecutor.cpp:1040
839
-#, fuzzy, c-format
840
-msgid "Stitching using \"%s\""
841
-msgstr "Сшивается %s"
842
+msgstr "Обновление метаданных..."
843
 
844
 #: hugin1/base_wx/huginConfig.cpp:37
845
 msgid "first image"
846
@@ -670,20 +623,18 @@
847
 msgid "directory"
848
 msgstr "каталог"
849
 
850
-#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:148
851
+#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:151
852
 msgid "Camera maker"
853
 msgstr "Производитель камеры"
854
 
855
-#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:149
856
+#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:152
857
 msgid "Camera model"
858
 msgstr "Модель камеры"
859
 
860
-#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691
861
-#: hugin1/hugin/ImagesTree.cpp:150 hugin1/hugin/ImagesTree.cpp:1180
862
-#: hugin1/hugin/xrc/image_variable_dlg.xrc:152
863
-#: hugin1/hugin/xrc/image_variable_dlg.xrc:347
864
-#: hugin1/hugin/xrc/lensdb_dialogs.xrc:8
865
-#: hugin1/hugin/xrc/lensdb_dialogs.xrc:325
866
+#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:682
867
+#: hugin1/hugin/ImagesTree.cpp:153 hugin1/hugin/ImagesTree.cpp:1169
868
+#: translations/xrc.cpp:191 translations/xrc.cpp:204 translations/xrc.cpp:299
869
+#: translations/xrc.cpp:320
870
 msgid "Lens"
871
 msgstr "Объектив"
872
 
873
@@ -691,27 +642,25 @@
874
 msgid "unknown projection"
875
 msgstr "неизвестная проекция"
876
 
877
-#: hugin1/base_wx/platform.cpp:131 hugin1/base_wx/wxLensDB.cpp:631
878
-#: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644
879
-#: hugin1/calibrate_lens/LensCalFrame.cpp:351
880
-#: hugin1/hugin/CPEditorPanel.cpp:2001 hugin1/hugin/GLViewer.cpp:155
881
-#: hugin1/hugin/GLViewer.cpp:167 hugin1/hugin/MainFrame.cpp:806
882
-#: hugin1/hugin/MainFrame.cpp:1478 hugin1/hugin/MainFrame.cpp:1540
883
-#: hugin1/hugin/MainFrame.cpp:1931 hugin1/hugin/MainFrame.cpp:2123
884
-#: hugin1/hugin/MainFrame.cpp:2172 hugin1/hugin/MainFrame.cpp:2210
885
-#: hugin1/hugin/MainFrame.cpp:2222 hugin1/hugin/MainFrame.cpp:2237
886
-#: hugin1/hugin/MainFrame.cpp:2245
887
-#: hugin1/hugin/OptimizePhotometricPanel.cpp:272
888
-#: hugin1/hugin/OptimizePhotometricPanel.cpp:310
889
-#: hugin1/hugin/PanoOperation.cpp:532 hugin1/hugin/PanoPanel.cpp:1050
890
-#: hugin1/hugin/PanoPanel.cpp:1265 hugin1/hugin/PanoPanel.cpp:1321
891
-#: hugin1/hugin/PreferencesDialog.cpp:420
892
-#: hugin1/hugin/PreferencesDialog.cpp:488
893
-#: hugin1/icpfind/AutoCtrlPointCreator.cpp:223
894
-#: hugin1/ptbatcher/FindPanoDialog.cpp:340
895
+#: hugin1/base_wx/platform.cpp:131 hugin1/base_wx/wxLensDB.cpp:633
896
+#: hugin1/base_wx/wxLensDB.cpp:638 hugin1/base_wx/wxLensDB.cpp:646
897
+#: hugin1/calibrate_lens/LensCalFrame.cpp:353
898
+#: hugin1/hugin/CPEditorPanel.cpp:1902 hugin1/hugin/GLViewer.cpp:288
899
+#: hugin1/hugin/GLViewer.cpp:300 hugin1/hugin/MainFrame.cpp:804
900
+#: hugin1/hugin/MainFrame.cpp:1431 hugin1/hugin/MainFrame.cpp:1479
901
+#: hugin1/hugin/MainFrame.cpp:1850 hugin1/hugin/MainFrame.cpp:2042
902
+#: hugin1/hugin/MainFrame.cpp:2093 hugin1/hugin/MainFrame.cpp:2131
903
+#: hugin1/hugin/MainFrame.cpp:2143 hugin1/hugin/MainFrame.cpp:2158
904
+#: hugin1/hugin/MainFrame.cpp:2166
905
+#: hugin1/hugin/OptimizePhotometricPanel.cpp:278
906
+#: hugin1/hugin/OptimizePhotometricPanel.cpp:315
907
+#: hugin1/hugin/PanoOperation.cpp:533 hugin1/hugin/PanoPanel.cpp:1010
908
+#: hugin1/hugin/PanoPanel.cpp:1225 hugin1/hugin/PreferencesDialog.cpp:419
909
+#: hugin1/hugin/PreferencesDialog.cpp:487
910
+#: hugin1/icpfind/AutoCtrlPointCreator.cpp:227
911
+#: hugin1/ptbatcher/FindPanoDialog.cpp:331
912
 #: hugin1/ptbatcher/ProjectListBox.cpp:184
913
-#: hugin1/stitch_project/hugin_stitch_project.cpp:372
914
-#: hugin1/stitch_project/hugin_stitch_project.cpp:415
915
+#: hugin1/stitch_project/hugin_stitch_project.cpp:404
916
 msgid "Error"
917
 msgstr "Ошибка"
918
 
919
@@ -729,7 +678,7 @@
920
 #: hugin1/base_wx/platform.cpp:487
921
 #, c-format
922
 msgid "Debug report generated in \"%s\"."
923
-msgstr ""
924
+msgstr "Отладочный отчет сгенерирован в \"%s\"."
925
 
926
 #: hugin1/base_wx/platform.h:43
927
 msgid ""
928
@@ -745,40 +694,39 @@
929
 "tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Файлы PNG (*.png)|*.png;*.PNG|Файлы HDR (*."
930
 "hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|Все файлы (*)|*"
931
 
932
-#: hugin1/base_wx/wxLensDB.cpp:132
933
-#, fuzzy, c-format
934
+#: hugin1/base_wx/wxLensDB.cpp:134
935
+#, c-format
936
 msgid "Camera %s (%s)"
937
-msgstr "Отклик камеры"
938
+msgstr "Камера %s (%s)"
939
 
940
-#: hugin1/base_wx/wxLensDB.cpp:207
941
+#: hugin1/base_wx/wxLensDB.cpp:209
942
 #, c-format
943
 msgid "The input \"%s\" is not a valid number."
944
 msgstr "Введено \"%s\" - это недопустимое число."
945
 
946
-#: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535
947
-#: hugin1/base_wx/wxPanoCommand.cpp:288 hugin1/base_wx/wxPanoCommand.cpp:298
948
-#: hugin1/base_wx/wxPanoCommand.cpp:319 hugin1/base_wx/wxPanoCommand.cpp:350
949
-#: hugin1/calibrate_lens/LensCalFrame.cpp:287
950
-#: hugin1/calibrate_lens/LensCalFrame.cpp:364
951
-#: hugin1/calibrate_lens/LensCalFrame.cpp:552
952
-#: hugin1/calibrate_lens/LensCalFrame.cpp:575
953
-#: hugin1/calibrate_lens/LensCalFrame.cpp:583
954
-#: hugin1/calibrate_lens/LensCalFrame.cpp:718
955
-#: hugin1/calibrate_lens/LensCalFrame.cpp:726
956
-#: hugin1/calibrate_lens/LensCalFrame.cpp:752
957
-#: hugin1/calibrate_lens/LensCalFrame.cpp:824
958
-#: hugin1/hugin/CPDetectorDialog.cpp:128 hugin1/hugin/GLPreviewFrame.cpp:1688
959
-#: hugin1/hugin/GLPreviewFrame.cpp:1695 hugin1/hugin/GLPreviewFrame.cpp:1702
960
-#: hugin1/hugin/GLPreviewFrame.cpp:1716 hugin1/hugin/GLPreviewFrame.cpp:1723
961
-#: hugin1/hugin/GLPreviewFrame.cpp:1730 hugin1/hugin/MainFrame.cpp:1709
962
-#: hugin1/hugin/MainFrame.cpp:2176 hugin1/hugin/MaskEditorPanel.cpp:503
963
-#: hugin1/hugin/PreferencesDialog.cpp:1080
964
-#: hugin1/ptbatcher/FindPanoDialog.cpp:296
965
-#: hugin1/ptbatcher/FindPanoDialog.cpp:317 hugin1/hugin/xrc/dlg_warning.xrc:56
966
+#: hugin1/base_wx/wxLensDB.cpp:209 hugin1/base_wx/wxLensDB.cpp:537
967
+#: hugin1/base_wx/wxPanoCommand.cpp:286
968
+#: hugin1/calibrate_lens/LensCalFrame.cpp:289
969
+#: hugin1/calibrate_lens/LensCalFrame.cpp:366
970
+#: hugin1/calibrate_lens/LensCalFrame.cpp:554
971
+#: hugin1/calibrate_lens/LensCalFrame.cpp:577
972
+#: hugin1/calibrate_lens/LensCalFrame.cpp:585
973
+#: hugin1/calibrate_lens/LensCalFrame.cpp:720
974
+#: hugin1/calibrate_lens/LensCalFrame.cpp:728
975
+#: hugin1/calibrate_lens/LensCalFrame.cpp:754
976
+#: hugin1/calibrate_lens/LensCalFrame.cpp:826
977
+#: hugin1/hugin/CPDetectorDialog.cpp:128 hugin1/hugin/GLPreviewFrame.cpp:1632
978
+#: hugin1/hugin/GLPreviewFrame.cpp:1639 hugin1/hugin/GLPreviewFrame.cpp:1646
979
+#: hugin1/hugin/GLPreviewFrame.cpp:1660 hugin1/hugin/GLPreviewFrame.cpp:1667
980
+#: hugin1/hugin/GLPreviewFrame.cpp:1674 hugin1/hugin/MainFrame.cpp:1648
981
+#: hugin1/hugin/MainFrame.cpp:2097 hugin1/hugin/MaskEditorPanel.cpp:489
982
+#: hugin1/hugin/PreferencesDialog.cpp:1059
983
+#: hugin1/ptbatcher/FindPanoDialog.cpp:287
984
+#: hugin1/ptbatcher/FindPanoDialog.cpp:308 translations/xrc.cpp:176
985
 msgid "Warning"
986
 msgstr "Предупреждение"
987
 
988
-#: hugin1/base_wx/wxLensDB.cpp:535
989
+#: hugin1/base_wx/wxLensDB.cpp:537
990
 msgid ""
991
 "There is too little information for saving data into database. Please check "
992
 "your input!"
993
@@ -786,13 +734,12 @@
994
 "Слишком мало информации для сохранения в базу данных. Проверьте введенные "
995
 "данные!"
996
 
997
-#: hugin1/base_wx/wxLensDB.cpp:631 hugin1/base_wx/wxLensDB.cpp:636
998
-#: hugin1/base_wx/wxLensDB.cpp:644
999
-#, fuzzy
1000
+#: hugin1/base_wx/wxLensDB.cpp:633 hugin1/base_wx/wxLensDB.cpp:638
1001
+#: hugin1/base_wx/wxLensDB.cpp:646
1002
 msgid "Could not save information into database."
1003
-msgstr "Невозможно сохранить информацию в файл базы данных."
1004
+msgstr "Невозможно сохранить информацию в базу данных."
1005
 
1006
-#: hugin1/base_wx/wxPanoCommand.cpp:279 hugin1/base_wx/wxPanoCommand.cpp:371
1007
+#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:298
1008
 #, c-format
1009
 msgid ""
1010
 "Could not decode image:\n"
1011
@@ -803,101 +750,41 @@
1012
 "%s\n"
1013
 "Прерывание"
1014
 
1015
-#: hugin1/base_wx/wxPanoCommand.cpp:279 hugin1/base_wx/wxPanoCommand.cpp:371
1016
+#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:298
1017
 msgid "Unsupported image file format"
1018
 msgstr "Неподдерживаемый формат снимков"
1019
 
1020
-#: hugin1/base_wx/wxPanoCommand.cpp:287
1021
-#: hugin1/calibrate_lens/LensCalFrame.cpp:286
1022
+#: hugin1/base_wx/wxPanoCommand.cpp:285
1023
+#: hugin1/calibrate_lens/LensCalFrame.cpp:288
1024
 #, c-format
1025
 msgid ""
1026
 "File \"%s\" is a black/white image.\n"
1027
 "Hugin does not support this image type. Skipping this image.\n"
1028
 "Convert image to grayscale image and try loading again."
1029
 msgstr ""
1030
+"Файл \"%s\" является черно-белым снимком.\n"
1031
+"Hugin не поддерживает такой тип снимков. Этот снимок будет пропущен.\n"
1032
+"Преобразуйте снимок в снимок с оттенками серого и попробуйте загрузить его снова."
1033
 
1034
-#: hugin1/base_wx/wxPanoCommand.cpp:297
1035
-#, c-format
1036
-msgid ""
1037
-"Hugin supports only grayscale and RGB images (without and with alpha "
1038
-"channel).\n"
1039
-"But file \"%s\" has %d channels and %d extra channels (probably alpha "
1040
-"channels).\n"
1041
-"Hugin does not support this image type. Skipping this image.\n"
1042
-"Convert this image to grayscale or RGB image and try loading again."
1043
-msgstr ""
1044
-
1045
-#: hugin1/base_wx/wxPanoCommand.cpp:307
1046
-msgid ""
1047
-"Hugin supports only grayscale or RGB images (without and with alpha channel)."
1048
-msgstr ""
1049
-
1050
-#: hugin1/base_wx/wxPanoCommand.cpp:311
1051
-#, c-format
1052
-msgid ""
1053
-"File \"%s\" is a grayscale image, but other images in project are color "
1054
-"images."
1055
-msgstr ""
1056
-
1057
-#: hugin1/base_wx/wxPanoCommand.cpp:315
1058
-#, c-format
1059
-msgid ""
1060
-"File \"%s\" is a color image, but other images in project are grayscale "
1061
-"images."
1062
-msgstr ""
1063
-
1064
-#: hugin1/base_wx/wxPanoCommand.cpp:318
1065
-msgid ""
1066
-"Hugin does not support this mixing. Skipping this image.\n"
1067
-"Convert this image to grayscale or RGB image and try loading again."
1068
-msgstr ""
1069
-
1070
-#: hugin1/base_wx/wxPanoCommand.cpp:335
1071
-#, c-format
1072
-msgid ""
1073
-"File \"%s\" has no embedded icc profile, but other images in project have "
1074
-"profile \"%s\" embedded."
1075
-msgstr ""
1076
-
1077
-#: hugin1/base_wx/wxPanoCommand.cpp:341
1078
-#, c-format
1079
-msgid ""
1080
-"File \"%s\" has icc profile \"%s\" embedded, but other images in project "
1081
-"have no embedded color profile."
1082
-msgstr ""
1083
-
1084
-#: hugin1/base_wx/wxPanoCommand.cpp:345
1085
-#, c-format
1086
-msgid ""
1087
-"File \"%s\" has icc profile \"%s\" embedded, but other images in project "
1088
-"have color profile \"%s\" embedded."
1089
-msgstr ""
1090
-
1091
-#: hugin1/base_wx/wxPanoCommand.cpp:349
1092
-msgid ""
1093
-"Hugin expects all images in the same color profile.\n"
1094
-"Please convert all images to same color profile and try again."
1095
-msgstr ""
1096
-
1097
-#: hugin1/base_wx/wxPanoCommand.cpp:542
1098
+#: hugin1/base_wx/wxPanoCommand.cpp:463
1099
 msgid ""
1100
 "Hugin has image stacks detected in the added images and will assign "
1101
 "corresponding stack numbers to the images."
1102
 msgstr ""
1103
 
1104
-#: hugin1/base_wx/wxPanoCommand.cpp:546
1105
+#: hugin1/base_wx/wxPanoCommand.cpp:467
1106
 msgid ""
1107
 "Hugin has image stacks detected in the whole project. Stack numbers will be "
1108
 "re-assigned on base of this detection. Existing stack assignments will be "
1109
 "overwritten."
1110
 msgstr ""
1111
 
1112
-#: hugin1/base_wx/wxPanoCommand.cpp:550 hugin1/base_wx/wxPanoCommand.cpp:571
1113
+#: hugin1/base_wx/wxPanoCommand.cpp:471 hugin1/base_wx/wxPanoCommand.cpp:492
1114
 #, fuzzy
1115
 msgid "Should the position of images in each stack be linked?"
1116
 msgstr "Пропустить загрузку очереди задач?"
1117
 
1118
-#: hugin1/base_wx/wxPanoCommand.cpp:558 hugin1/hugin/xrc/main_frame.xrc:215
1119
+#: hugin1/base_wx/wxPanoCommand.cpp:479 translations/xrc.cpp:343
1120
 msgid ""
1121
 "When shooting bracketed image stacks from a sturdy tripod the position of "
1122
 "the images in each stack can be linked to help Hugin to process the "
1123
@@ -905,29 +792,28 @@
1124
 "position (e. g. when shooting hand held), then don't link the position."
1125
 msgstr ""
1126
 
1127
-#: hugin1/base_wx/wxPanoCommand.cpp:561 hugin1/base_wx/wxPanoCommand.cpp:565
1128
-#: hugin1/hugin/xrc/main_frame.xrc:236
1129
+#: hugin1/base_wx/wxPanoCommand.cpp:482 hugin1/base_wx/wxPanoCommand.cpp:486
1130
+#: translations/xrc.cpp:344
1131
 #, fuzzy
1132
 msgid "Link position"
1133
 msgstr "Сбросить расположение"
1134
 
1135
-#: hugin1/base_wx/wxPanoCommand.cpp:561 hugin1/base_wx/wxPanoCommand.cpp:565
1136
-#: hugin1/hugin/xrc/main_frame.xrc:242
1137
+#: hugin1/base_wx/wxPanoCommand.cpp:482 hugin1/base_wx/wxPanoCommand.cpp:486
1138
+#: translations/xrc.cpp:345
1139
 #, fuzzy
1140
 msgid "Don't link position"
1141
 msgstr "Опции командной строки"
1142
 
1143
-#: hugin1/base_wx/wxPanoCommand.cpp:561 hugin1/base_wx/wxPanoCommand.cpp:578
1144
-#: hugin1/hugin/xrc/main_frame.xrc:247
1145
+#: hugin1/base_wx/wxPanoCommand.cpp:482 hugin1/base_wx/wxPanoCommand.cpp:499
1146
+#: translations/xrc.cpp:346
1147
 msgid "Don't assign stacks"
1148
 msgstr ""
1149
 
1150
-#: hugin1/base_wx/wxPanoCommand.cpp:565 hugin1/base_wx/wxPanoCommand.cpp:582
1151
-#, fuzzy
1152
+#: hugin1/base_wx/wxPanoCommand.cpp:486 hugin1/base_wx/wxPanoCommand.cpp:503
1153
 msgid "Keep existing stacks"
1154
-msgstr "Перезаписать существующие снимки"
1155
+msgstr "Сохранить существующие стопки"
1156
 
1157
-#: hugin1/base_wx/wxPanoCommand.cpp:684
1158
+#: hugin1/base_wx/wxPanoCommand.cpp:605
1159
 #, c-format
1160
 msgid ""
1161
 "Image file not found:\n"
1162
@@ -938,16 +824,17 @@
1163
 "%s\n"
1164
 "Выберите правильный файл"
1165
 
1166
-#: hugin1/base_wx/wxPanoCommand.cpp:684
1167
+#: hugin1/base_wx/wxPanoCommand.cpp:605
1168
 msgid "Image file not found"
1169
 msgstr "Файл снимка не найден"
1170
 
1171
-#: hugin1/base_wx/wxPanoCommand.cpp:691 hugin1/base_wx/wxPanoCommand.cpp:883
1172
-#: hugin1/calibrate_lens/LensCalFrame.cpp:372 hugin1/hugin/PanoOperation.cpp:91
1173
+#: hugin1/base_wx/wxPanoCommand.cpp:612 hugin1/base_wx/wxPanoCommand.cpp:798
1174
+#: hugin1/calibrate_lens/LensCalFrame.cpp:374
1175
+#: hugin1/hugin/PanoOperation.cpp:92
1176
 msgid "Add images"
1177
 msgstr "Добавить снимки"
1178
 
1179
-#: hugin1/base_wx/wxPanoCommand.cpp:797
1180
+#: hugin1/base_wx/wxPanoCommand.cpp:713
1181
 #, c-format
1182
 msgid ""
1183
 "%d invalid control point(s) found.\n"
1184
@@ -958,11 +845,11 @@
1185
 "\n"
1186
 "Нажмите ОК, чтобы удалить их."
1187
 
1188
-#: hugin1/base_wx/wxPanoCommand.cpp:798
1189
+#: hugin1/base_wx/wxPanoCommand.cpp:714
1190
 msgid "Error Detected"
1191
 msgstr "Обнаружена ошибка"
1192
 
1193
-#: hugin1/base_wx/wxPanoCommand.cpp:963
1194
+#: hugin1/base_wx/wxPanoCommand.cpp:878
1195
 #, c-format
1196
 msgid ""
1197
 "Error, template expects %d images,\n"
1198
@@ -971,43 +858,43 @@
1199
 "Ошибка: шаблон прелполагает наличие %d снимков в проекте,\n"
1200
 "но в текущем проекте их всего %d.\n"
1201
 
1202
-#: hugin1/base_wx/wxPanoCommand.cpp:964 hugin1/base_wx/wxPanoCommand.cpp:989
1203
+#: hugin1/base_wx/wxPanoCommand.cpp:879 hugin1/base_wx/wxPanoCommand.cpp:904
1204
 msgid "Could not apply template"
1205
 msgstr "Не удалось применить шаблон"
1206
 
1207
-#: hugin1/base_wx/wxPanoCommand.cpp:989
1208
+#: hugin1/base_wx/wxPanoCommand.cpp:904
1209
 msgid "Error loading project file"
1210
 msgstr "Ошибка при открытии проектного файла"
1211
 
1212
-#: hugin1/base_wx/wxPanoCommand.cpp:1003
1213
+#: hugin1/base_wx/wxPanoCommand.cpp:918
1214
 msgid "Result"
1215
 msgstr "Результат"
1216
 
1217
-#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:207
1218
-#: hugin1/ptbatcher/PTBatcherGUI.cpp:82
1219
+#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:184
1220
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:79
1221
 msgid "xrc directory not found in bundle"
1222
 msgstr "xrc каталог не найден в поставке"
1223
 
1224
 #: hugin1/calibrate_lens/LensCalApp.cpp:65
1225
 #: hugin1/calibrate_lens/LensCalApp.cpp:73
1226
 #: hugin1/calibrate_lens/LensCalApp.cpp:84
1227
-#: hugin1/executor/hugin_executor.cpp:82 hugin1/hugin/MainFrame.cpp:1926
1228
-#: hugin1/hugin/huginApp.cpp:207 hugin1/hugin/huginApp.cpp:235
1229
-#: hugin1/hugin/huginApp.cpp:248 hugin1/ptbatcher/PTBatcherGUI.cpp:82
1230
-#: hugin1/ptbatcher/PTBatcherGUI.cpp:93 hugin1/ptbatcher/PTBatcherGUI.cpp:114
1231
-#: hugin1/stitch_project/hugin_stitch_project.cpp:297
1232
+#: hugin1/executor/hugin_executor.cpp:78 hugin1/hugin/MainFrame.cpp:1845
1233
+#: hugin1/hugin/huginApp.cpp:184 hugin1/hugin/huginApp.cpp:212
1234
+#: hugin1/hugin/huginApp.cpp:225 hugin1/ptbatcher/PTBatcherGUI.cpp:79
1235
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:90 hugin1/ptbatcher/PTBatcherGUI.cpp:111
1236
+#: hugin1/stitch_project/hugin_stitch_project.cpp:299
1237
 msgid "Fatal Error"
1238
 msgstr "Критическая ошибка"
1239
 
1240
 #: hugin1/calibrate_lens/LensCalApp.cpp:73
1241
-#: hugin1/executor/hugin_executor.cpp:82 hugin1/hugin/huginApp.cpp:235
1242
-#: hugin1/ptbatcher/PTBatcherGUI.cpp:93
1243
-#: hugin1/stitch_project/hugin_stitch_project.cpp:297
1244
+#: hugin1/executor/hugin_executor.cpp:78 hugin1/hugin/huginApp.cpp:212
1245
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:90
1246
+#: hugin1/stitch_project/hugin_stitch_project.cpp:299
1247
 msgid "Translations not found in bundle"
1248
 msgstr "Файлы локализации не найдены в поставке"
1249
 
1250
-#: hugin1/calibrate_lens/LensCalApp.cpp:84 hugin1/hugin/huginApp.cpp:248
1251
-#: hugin1/ptbatcher/PTBatcherGUI.cpp:114
1252
+#: hugin1/calibrate_lens/LensCalApp.cpp:84 hugin1/hugin/huginApp.cpp:225
1253
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:111
1254
 msgid ""
1255
 "xrc directory not found, hugin needs to be properly installed\n"
1256
 "Tried Path:"
1257
@@ -1015,21 +902,21 @@
1258
 "xrc каталог не найден, Hugin не был корректно установлен\n"
1259
 "Путь поиска:"
1260
 
1261
-#: hugin1/calibrate_lens/LensCalFrame.cpp:159
1262
+#: hugin1/calibrate_lens/LensCalFrame.cpp:161
1263
 msgid "Hugin Lens calibration GUI"
1264
 msgstr "Hugin интерфейс калибровки объективов"
1265
 
1266
-#: hugin1/calibrate_lens/LensCalFrame.cpp:320
1267
+#: hugin1/calibrate_lens/LensCalFrame.cpp:322
1268
 #, c-format
1269
 msgid "Added %s"
1270
 msgstr "Добавлен %s"
1271
 
1272
-#: hugin1/calibrate_lens/LensCalFrame.cpp:350
1273
+#: hugin1/calibrate_lens/LensCalFrame.cpp:352
1274
 #, c-format
1275
 msgid "The size of the images (%s) does not match the already added image(s)."
1276
 msgstr "Размер снимков (%s) не совпадает с уже загруженными снимками."
1277
 
1278
-#: hugin1/calibrate_lens/LensCalFrame.cpp:363
1279
+#: hugin1/calibrate_lens/LensCalFrame.cpp:365
1280
 #, c-format
1281
 msgid ""
1282
 "The EXIF information of the added images (%s) is not consistent with the "
1283
@@ -1040,21 +927,21 @@
1284
 "добавленными.\n"
1285
 "Проверьте снимки снова, чтобы были правильные."
1286
 
1287
-#: hugin1/calibrate_lens/LensCalFrame.cpp:446 hugin1/hugin/MainFrame.cpp:1038
1288
+#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1036
1289
 msgid "Add Image: cancel"
1290
 msgstr "Добавить снимок: отмена"
1291
 
1292
-#: hugin1/calibrate_lens/LensCalFrame.cpp:454
1293
-#: hugin1/calibrate_lens/LensCalFrame.cpp:464
1294
+#: hugin1/calibrate_lens/LensCalFrame.cpp:456
1295
+#: hugin1/calibrate_lens/LensCalFrame.cpp:466
1296
 #, c-format
1297
 msgid "%s (%d lines)"
1298
 msgstr "%s (%d линий)"
1299
 
1300
-#: hugin1/calibrate_lens/LensCalFrame.cpp:552
1301
-#: hugin1/calibrate_lens/LensCalFrame.cpp:575
1302
-#: hugin1/calibrate_lens/LensCalFrame.cpp:718
1303
-#: hugin1/calibrate_lens/LensCalFrame.cpp:752
1304
-#: hugin1/calibrate_lens/LensCalFrame.cpp:824
1305
+#: hugin1/calibrate_lens/LensCalFrame.cpp:554
1306
+#: hugin1/calibrate_lens/LensCalFrame.cpp:577
1307
+#: hugin1/calibrate_lens/LensCalFrame.cpp:720
1308
+#: hugin1/calibrate_lens/LensCalFrame.cpp:754
1309
+#: hugin1/calibrate_lens/LensCalFrame.cpp:826
1310
 msgid ""
1311
 "There are invalid values in the input boxes.\n"
1312
 "Please check your inputs."
1313
@@ -1062,20 +949,20 @@
1314
 "В полях ввода есть недопустимые значения.\n"
1315
 "Проверьте введенные значения."
1316
 
1317
-#: hugin1/calibrate_lens/LensCalFrame.cpp:561
1318
+#: hugin1/calibrate_lens/LensCalFrame.cpp:563
1319
 msgid "Detecting edges..."
1320
 msgstr "Определение границ..."
1321
 
1322
-#: hugin1/calibrate_lens/LensCalFrame.cpp:563
1323
+#: hugin1/calibrate_lens/LensCalFrame.cpp:565
1324
 msgid "Finding lines..."
1325
 msgstr "Поиск линий..."
1326
 
1327
-#: hugin1/calibrate_lens/LensCalFrame.cpp:567
1328
-#: hugin1/calibrate_lens/LensCalFrame.cpp:683
1329
+#: hugin1/calibrate_lens/LensCalFrame.cpp:569
1330
+#: hugin1/calibrate_lens/LensCalFrame.cpp:685
1331
 msgid "Finished"
1332
 msgstr "Закончено"
1333
 
1334
-#: hugin1/calibrate_lens/LensCalFrame.cpp:583
1335
+#: hugin1/calibrate_lens/LensCalFrame.cpp:585
1336
 msgid ""
1337
 "There are no detected lines.\n"
1338
 "Please run \"Find lines\" first. If there are no lines found, change the "
1339
@@ -1084,11 +971,11 @@
1340
 "Не заданы линии.\n"
1341
 "Запустите сначала \"Найти линии\". Если линий не найдено, измените настройки."
1342
 
1343
-#: hugin1/calibrate_lens/LensCalFrame.cpp:667
1344
+#: hugin1/calibrate_lens/LensCalFrame.cpp:669
1345
 msgid "Optimizing lens distortion parameters..."
1346
 msgstr "Оптимизация параметров искажения объектива..."
1347
 
1348
-#: hugin1/calibrate_lens/LensCalFrame.cpp:726
1349
+#: hugin1/calibrate_lens/LensCalFrame.cpp:728
1350
 msgid ""
1351
 "There are no detected lines.\n"
1352
 "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If "
1353
@@ -1098,132 +985,121 @@
1354
 "Запустите \"Найти линии\" и \"Оптимизировать\" перед сохранением данных "
1355
 "объектива. Если линий не найдено, измените настройки."
1356
 
1357
-#: hugin1/calibrate_lens/LensCalFrame.cpp:731
1358
+#: hugin1/calibrate_lens/LensCalFrame.cpp:733
1359
 msgid "Save lens parameters to ini file"
1360
 msgstr "Сохранить конфигурацию объектива в ini-файл"
1361
 
1362
-#: hugin1/calibrate_lens/LensCalFrame.cpp:732
1363
-#: hugin1/hugin/PanoOperation.cpp:566
1364
-#, fuzzy
1365
+#: hugin1/calibrate_lens/LensCalFrame.cpp:734
1366
+#: hugin1/hugin/PanoOperation.cpp:567
1367
 msgid "Save lens parameters to lens database"
1368
-msgstr "Сохранить конфигурацию объектива в базу данных lensfun"
1369
+msgstr "Сохранить конфигурацию объектива в базу данных объктивов"
1370
 
1371
-#: hugin1/calibrate_lens/LensCalFrame.cpp:733
1372
+#: hugin1/calibrate_lens/LensCalFrame.cpp:735
1373
 msgid "Saving lens data"
1374
 msgstr "Сохраняются данные объектива"
1375
 
1376
-#: hugin1/calibrate_lens/LensCalFrame.cpp:733
1377
-#: hugin1/hugin/xrc/lenscal_frame.xrc:373
1378
+#: hugin1/calibrate_lens/LensCalFrame.cpp:735 translations/xrc.cpp:287
1379
 msgid "Save lens"
1380
 msgstr "Сохранить объективы"
1381
 
1382
-#: hugin1/calibrate_lens/LensCalFrame.cpp:756 hugin1/hugin/MainFrame.cpp:824
1383
+#: hugin1/calibrate_lens/LensCalFrame.cpp:758 hugin1/hugin/MainFrame.cpp:822
1384
 msgid "Save project file"
1385
 msgstr "Сохранить файл проекта"
1386
 
1387
-#: hugin1/calibrate_lens/LensCalFrame.cpp:757 hugin1/hugin/MainFrame.cpp:826
1388
-#: hugin1/hugin/MainFrame.cpp:962 hugin1/hugin/MainFrame.cpp:1447
1389
-#: hugin1/hugin/MainFrame.cpp:1506 hugin1/ptbatcher/Batch.cpp:665
1390
-#: hugin1/ptbatcher/BatchFrame.cpp:429 hugin1/ptbatcher/BatchFrame.cpp:457
1391
-#: hugin1/stitch_project/hugin_stitch_project.cpp:382
1392
+#: hugin1/calibrate_lens/LensCalFrame.cpp:759 hugin1/hugin/MainFrame.cpp:824
1393
+#: hugin1/hugin/MainFrame.cpp:960 hugin1/hugin/MainFrame.cpp:1400
1394
+#: hugin1/hugin/MainFrame.cpp:1445 hugin1/ptbatcher/Batch.cpp:636
1395
+#: hugin1/ptbatcher/BatchFrame.cpp:435 hugin1/ptbatcher/BatchFrame.cpp:463
1396
+#: hugin1/stitch_project/hugin_stitch_project.cpp:371
1397
 msgid "Project files (*.pto)|*.pto|All files (*)|*"
1398
 msgstr "Файлы проектов (*.pto)|*.pto|Все файлы (*)|*"
1399
 
1400
-#: hugin1/executor/hugin_executor.cpp:193
1401
-#, fuzzy
1402
+#: hugin1/executor/hugin_executor.cpp:179
1403
 msgid "Removing temporary files..."
1404
-msgstr "очистка временных файлов ключевых точек"
1405
+msgstr "Удаляются временные файлы..."
1406
 
1407
-#: hugin1/executor/hugin_executor.cpp:211
1408
+#: hugin1/executor/hugin_executor.cpp:197
1409
 msgid "shows this help message"
1410
-msgstr ""
1411
+msgstr "показать эту справку"
1412
 
1413
-#: hugin1/executor/hugin_executor.cpp:212
1414
-#, fuzzy
1415
+#: hugin1/executor/hugin_executor.cpp:198
1416
 msgid "execute assistant"
1417
-msgstr "Запустить а&ссистента"
1418
+msgstr "запустить ассистента"
1419
 
1420
-#: hugin1/executor/hugin_executor.cpp:213
1421
+#: hugin1/executor/hugin_executor.cpp:199
1422
 msgid "execute stitching with given project"
1423
 msgstr ""
1424
 
1425
-#: hugin1/executor/hugin_executor.cpp:214
1426
-#, fuzzy
1427
+#: hugin1/executor/hugin_executor.cpp:200
1428
 msgid "number of used threads"
1429
-msgstr "Число потоков:"
1430
+msgstr "число используемых потоков:"
1431
 
1432
-#: hugin1/executor/hugin_executor.cpp:215
1433
+#: hugin1/executor/hugin_executor.cpp:201
1434
 #, fuzzy
1435
 msgid "prefix used for stitching"
1436
 msgstr "Изменить сценарий перед сшивкой"
1437
 
1438
-#: hugin1/executor/hugin_executor.cpp:216
1439
-msgid "use user defined commands in given file"
1440
-msgstr ""
1441
-
1442
-#: hugin1/executor/hugin_executor.cpp:217
1443
-#, fuzzy
1444
+#: hugin1/executor/hugin_executor.cpp:202
1445
 msgid "only print commands"
1446
-msgstr "Выполняется команда \""
1447
+msgstr "только вывести команды"
1448
 
1449
-#: hugin1/hugin/AboutDialog.cpp:142
1450
+#: hugin1/hugin/AboutDialog.cpp:139
1451
 #, c-format
1452
 msgid "Operating System: %s"
1453
 msgstr "Операционная система: %s"
1454
 
1455
-#: hugin1/hugin/AboutDialog.cpp:145
1456
+#: hugin1/hugin/AboutDialog.cpp:142
1457
 msgid "64 bit"
1458
 msgstr "64 битная"
1459
 
1460
-#: hugin1/hugin/AboutDialog.cpp:147
1461
+#: hugin1/hugin/AboutDialog.cpp:144
1462
 msgid "32 bit"
1463
 msgstr "32 битная"
1464
 
1465
-#: hugin1/hugin/AboutDialog.cpp:148
1466
+#: hugin1/hugin/AboutDialog.cpp:145
1467
 #, c-format
1468
 msgid "Architecture: %s"
1469
 msgstr "Архитектура: %s"
1470
 
1471
-#: hugin1/hugin/AboutDialog.cpp:151
1472
-#, fuzzy, c-format
1473
+#: hugin1/hugin/AboutDialog.cpp:148
1474
+#, c-format
1475
 msgid "Free memory: %lld kiB"
1476
-msgstr "Свободная память: %ld Кбайт"
1477
+msgstr "Свободная память: %lld Кбайт"
1478
 
1479
-#: hugin1/hugin/AboutDialog.cpp:154
1480
+#: hugin1/hugin/AboutDialog.cpp:151
1481
 #, c-format
1482
 msgid "Active Codepage: %u"
1483
 msgstr "Активная кодировка: %u"
1484
 
1485
-#: hugin1/hugin/AboutDialog.cpp:186
1486
+#: hugin1/hugin/AboutDialog.cpp:183
1487
 #, c-format
1488
 msgid "Version: %s"
1489
 msgstr "Версия: %s"
1490
 
1491
-#: hugin1/hugin/AboutDialog.cpp:187
1492
+#: hugin1/hugin/AboutDialog.cpp:184
1493
 #, c-format
1494
 msgid "Path to resources: %s"
1495
 msgstr "Расположение ресурсов: %s"
1496
 
1497
-#: hugin1/hugin/AboutDialog.cpp:188
1498
+#: hugin1/hugin/AboutDialog.cpp:185
1499
 #, c-format
1500
 msgid "Path to data: %s"
1501
 msgstr "Расположение данных: %s"
1502
 
1503
-#: hugin1/hugin/AboutDialog.cpp:190
1504
-#, fuzzy, c-format
1505
+#: hugin1/hugin/AboutDialog.cpp:187
1506
+#, c-format
1507
 msgid "Hugins camera and lens database: %s"
1508
-msgstr "Данные камеры и объектива"
1509
+msgstr "База данных камеры и объектива Hugin: %s"
1510
 
1511
-#: hugin1/hugin/AboutDialog.cpp:191
1512
+#: hugin1/hugin/AboutDialog.cpp:189
1513
 msgid "Multi-threading using C++11 std::thread and OpenMP"
1514
-msgstr ""
1515
+msgstr "Многопоточность с использованием C++11 std::thread и OpenMP"
1516
 
1517
-#: hugin1/hugin/AboutDialog.cpp:194
1518
-#, fuzzy, c-format
1519
-msgid "Monitor profile: %s"
1520
-msgstr "Не удалось прочитать проектный файл %s."
1521
+#: hugin1/hugin/AboutDialog.cpp:191
1522
+msgid "Multi-threading using boost::thread and OpenMP"
1523
+msgstr "Многопоточность с использованием boost::thread и OpenMP"
1524
 
1525
-#: hugin1/hugin/AboutDialog.cpp:196
1526
+#: hugin1/hugin/AboutDialog.cpp:193
1527
 msgid "Libraries"
1528
 msgstr "Библиотеки"
1529
 
1530
@@ -1259,48 +1135,48 @@
1531
 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat"
1532
 msgstr "Исполняемые файлы (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat"
1533
 
1534
-#: hugin1/hugin/CPEditorPanel.cpp:142
1535
+#: hugin1/hugin/CPEditorPanel.cpp:145
1536
 msgid "#"
1537
 msgstr "№"
1538
 
1539
-#: hugin1/hugin/CPEditorPanel.cpp:143
1540
+#: hugin1/hugin/CPEditorPanel.cpp:146
1541
 msgid "left x"
1542
 msgstr "X слева"
1543
 
1544
-#: hugin1/hugin/CPEditorPanel.cpp:144
1545
+#: hugin1/hugin/CPEditorPanel.cpp:147
1546
 msgid "left y"
1547
 msgstr "Y слева"
1548
 
1549
-#: hugin1/hugin/CPEditorPanel.cpp:145
1550
+#: hugin1/hugin/CPEditorPanel.cpp:148
1551
 msgid "right x"
1552
 msgstr "X справа"
1553
 
1554
-#: hugin1/hugin/CPEditorPanel.cpp:146
1555
+#: hugin1/hugin/CPEditorPanel.cpp:149
1556
 msgid "right y"
1557
 msgstr "Y справа"
1558
 
1559
-#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96
1560
+#: hugin1/hugin/CPEditorPanel.cpp:150 hugin1/hugin/CPListFrame.cpp:100
1561
 msgid "Alignment"
1562
 msgstr "Выравнивание"
1563
 
1564
-#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97
1565
+#: hugin1/hugin/CPEditorPanel.cpp:151 hugin1/hugin/CPListFrame.cpp:101
1566
 msgid "Distance"
1567
 msgstr "Расстояние"
1568
 
1569
-#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:547
1570
+#: hugin1/hugin/CPEditorPanel.cpp:383 hugin1/hugin/CPEditorPanel.cpp:521
1571
 msgid "new control point added"
1572
 msgstr "добавлена новая контрольная точка"
1573
 
1574
-#: hugin1/hugin/CPEditorPanel.cpp:668 hugin1/hugin/CPEditorPanel.cpp:1102
1575
+#: hugin1/hugin/CPEditorPanel.cpp:642 hugin1/hugin/CPEditorPanel.cpp:1076
1576
 msgid "searching similar points..."
1577
 msgstr "поиск похожих точек..."
1578
 
1579
-#: hugin1/hugin/CPEditorPanel.cpp:687 hugin1/hugin/CPEditorPanel.cpp:827
1580
+#: hugin1/hugin/CPEditorPanel.cpp:661 hugin1/hugin/CPEditorPanel.cpp:801
1581
 msgid "Error during Fine-tune"
1582
 msgstr "Ошибка в ходе точной коррекции"
1583
 
1584
-#: hugin1/hugin/CPEditorPanel.cpp:706 hugin1/hugin/CPEditorPanel.cpp:851
1585
-#: hugin1/hugin/CPEditorPanel.cpp:1125
1586
+#: hugin1/hugin/CPEditorPanel.cpp:680 hugin1/hugin/CPEditorPanel.cpp:825
1587
+#: hugin1/hugin/CPEditorPanel.cpp:1099
1588
 #, c-format
1589
 msgid ""
1590
 "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, "
1591
@@ -1309,25 +1185,25 @@
1592
 "Точка настроена, угол: %.0f градусов, коэфф. корреляции: %0.3f, кривизна: "
1593
 "%0.3f %0.3f "
1594
 
1595
-#: hugin1/hugin/CPEditorPanel.cpp:709 hugin1/hugin/CPEditorPanel.cpp:854
1596
+#: hugin1/hugin/CPEditorPanel.cpp:683 hugin1/hugin/CPEditorPanel.cpp:828
1597
 msgid "change points, or press right mouse button to add the pair"
1598
 msgstr "смените точки, либо нажмите правую кнопку мыши, чтобы добавить пару"
1599
 
1600
-#: hugin1/hugin/CPEditorPanel.cpp:730
1601
+#: hugin1/hugin/CPEditorPanel.cpp:704
1602
 msgid "Estimated point outside image"
1603
 msgstr "Расчётная точка вне снимка"
1604
 
1605
-#: hugin1/hugin/CPEditorPanel.cpp:1132 hugin1/hugin/CPEditorPanel.cpp:1157
1606
+#: hugin1/hugin/CPEditorPanel.cpp:1106 hugin1/hugin/CPEditorPanel.cpp:1131
1607
 msgid "No similar point found."
1608
 msgstr "Схожая точка не найдена."
1609
 
1610
-#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1142
1611
+#: hugin1/hugin/CPEditorPanel.cpp:1113 hugin1/hugin/CPEditorPanel.cpp:1116
1612
 msgid ""
1613
 "An internal transformation went wrong.\n"
1614
 "Check that the point is inside the image."
1615
 msgstr ""
1616
 
1617
-#: hugin1/hugin/CPEditorPanel.cpp:1164
1618
+#: hugin1/hugin/CPEditorPanel.cpp:1138
1619
 #, c-format
1620
 msgid ""
1621
 "Check the similarity visually.\n"
1622
@@ -1337,7 +1213,7 @@
1623
 "Проверьте соответствие визуально.\n"
1624
 "Коэффициент корреляции (%.3f) ниже порога, указанного в параметрах программы."
1625
 
1626
-#: hugin1/hugin/CPEditorPanel.cpp:1169
1627
+#: hugin1/hugin/CPEditorPanel.cpp:1143
1628
 #, c-format
1629
 msgid ""
1630
 "No similar point found. Check the similarity visually.\n"
1631
@@ -1347,31 +1223,31 @@
1632
 "Похожих точек не найдено. Проверьте соответствие визуально.\n"
1633
 "Коэффициент корреляции (%.3f) ниже порога, указанного в параметрах программы."
1634
 
1635
-#: hugin1/hugin/CPEditorPanel.cpp:1198 hugin1/hugin/CPEditorPanel.cpp:1209
1636
+#: hugin1/hugin/CPEditorPanel.cpp:1172 hugin1/hugin/CPEditorPanel.cpp:1183
1637
 msgid "Add new Line"
1638
 msgstr "Добавить новую линию"
1639
 
1640
-#: hugin1/hugin/CPEditorPanel.cpp:1204 hugin1/hugin/CPEditorPanel.cpp:1207
1641
-#: hugin1/hugin/CPEditorPanel.cpp:1468 hugin1/hugin/CPListFrame.cpp:156
1642
+#: hugin1/hugin/CPEditorPanel.cpp:1178 hugin1/hugin/CPEditorPanel.cpp:1181
1643
+#: hugin1/hugin/CPEditorPanel.cpp:1441 hugin1/hugin/CPListFrame.cpp:160
1644
 #, c-format
1645
 msgid "Line %d"
1646
 msgstr "Линия %d"
1647
 
1648
-#: hugin1/hugin/CPEditorPanel.cpp:1459 hugin1/hugin/CPListFrame.cpp:147
1649
-#: hugin1/hugin/GLPreviewFrame.cpp:697 hugin1/hugin/GLPreviewFrame.cpp:3084
1650
-#: hugin1/hugin/PreviewFrame.cpp:244 hugin1/hugin/xrc/cp_editor_panel.xrc:185
1651
+#: hugin1/hugin/CPEditorPanel.cpp:1432 hugin1/hugin/CPListFrame.cpp:151
1652
+#: hugin1/hugin/GLPreviewFrame.cpp:660 hugin1/hugin/GLPreviewFrame.cpp:3025
1653
+#: hugin1/hugin/PreviewFrame.cpp:246 translations/xrc.cpp:122
1654
 msgid "normal"
1655
 msgstr "Нормальный"
1656
 
1657
-#: hugin1/hugin/CPEditorPanel.cpp:1462 hugin1/hugin/CPListFrame.cpp:150
1658
+#: hugin1/hugin/CPEditorPanel.cpp:1435 hugin1/hugin/CPListFrame.cpp:154
1659
 msgid "vert. Line"
1660
 msgstr "верт. линия"
1661
 
1662
-#: hugin1/hugin/CPEditorPanel.cpp:1465 hugin1/hugin/CPListFrame.cpp:153
1663
+#: hugin1/hugin/CPEditorPanel.cpp:1438 hugin1/hugin/CPListFrame.cpp:157
1664
 msgid "horiz. Line"
1665
 msgstr "гор. линия"
1666
 
1667
-#: hugin1/hugin/CPEditorPanel.cpp:1748
1668
+#: hugin1/hugin/CPEditorPanel.cpp:1698
1669
 msgid ""
1670
 "Create control points.\n"
1671
 "To create less points,\n"
1672
@@ -1380,38 +1256,32 @@
1673
 "Создайте контрольные точки.\n"
1674
 "Чем больше число, тем меньше точек."
1675
 
1676
-#: hugin1/hugin/CPEditorPanel.cpp:1748
1677
+#: hugin1/hugin/CPEditorPanel.cpp:1698
1678
 msgid "Corner Detection threshold"
1679
 msgstr "Порог определения углов"
1680
 
1681
-#: hugin1/hugin/CPEditorPanel.cpp:1748 hugin1/hugin/CPEditorPanel.cpp:1752
1682
-#: hugin1/hugin/xrc/cp_editor_panel.xrc:323
1683
-#: hugin1/hugin/xrc/images_panel.xrc:251
1684
+#: hugin1/hugin/CPEditorPanel.cpp:1698 hugin1/hugin/CPEditorPanel.cpp:1702
1685
+#: translations/xrc.cpp:248
1686
 msgid "Create control points"
1687
 msgstr "Создать контрольные точки"
1688
 
1689
-#: hugin1/hugin/CPEditorPanel.cpp:1752
1690
+#: hugin1/hugin/CPEditorPanel.cpp:1702
1691
 msgid "Corner Detection scale"
1692
 msgstr "Масштаб определения углов"
1693
 
1694
-#: hugin1/hugin/CPEditorPanel.cpp:1764
1695
+#: hugin1/hugin/CPEditorPanel.cpp:1714
1696
 msgid "Error during control point creation:\n"
1697
 msgstr "Ошибка при создании контрольной точки:\n"
1698
 
1699
-#: hugin1/hugin/CPEditorPanel.cpp:1861
1700
+#: hugin1/hugin/CPEditorPanel.cpp:1811
1701
 msgid "Select point in right image"
1702
 msgstr "Выберите точку в снимке справа"
1703
 
1704
-#: hugin1/hugin/CPEditorPanel.cpp:1873
1705
+#: hugin1/hugin/CPEditorPanel.cpp:1823
1706
 msgid "Select point in left image"
1707
 msgstr "Выберите точку в снимке слева"
1708
 
1709
-#: hugin1/hugin/CPEditorPanel.cpp:1950
1710
-#, c-format
1711
-msgid "Create cp (Current setting: %s)"
1712
-msgstr ""
1713
-
1714
-#: hugin1/hugin/CPEditorPanel.cpp:2001
1715
+#: hugin1/hugin/CPEditorPanel.cpp:1902
1716
 msgid ""
1717
 "Cannot run celeste without at least one control point connecting the two "
1718
 "images"
1719
@@ -1419,79 +1289,45 @@
1720
 "Невозможно запустить Celeste без хотя бы одной контрольной точки, "
1721
 "соединяющей два снимка."
1722
 
1723
-#: hugin1/hugin/CPEditorPanel.cpp:2006 hugin1/hugin/CPEditorPanel.cpp:2026
1724
-#: hugin1/hugin/PanoOperation.cpp:716 hugin1/hugin/PanoOperation.cpp:766
1725
+#: hugin1/hugin/CPEditorPanel.cpp:1907 hugin1/hugin/CPEditorPanel.cpp:1927
1726
+#: hugin1/hugin/PanoOperation.cpp:720 hugin1/hugin/PanoOperation.cpp:766
1727
 msgid "Running Celeste"
1728
 msgstr "Выполняется Celeste"
1729
 
1730
-#: hugin1/hugin/CPEditorPanel.cpp:2007 hugin1/hugin/PanoOperation.cpp:717
1731
+#: hugin1/hugin/CPEditorPanel.cpp:1908 hugin1/hugin/PanoOperation.cpp:721
1732
 msgid "Loading model file"
1733
 msgstr "Загружается файл модели"
1734
 
1735
-#: hugin1/hugin/CPEditorPanel.cpp:2068 hugin1/hugin/CPEditorPanel.cpp:2104
1736
-#: hugin1/hugin/MainFrame.cpp:1670 hugin1/hugin/PanoOperation.cpp:703
1737
-#: hugin1/hugin/PanoOperation.cpp:795
1738
+#: hugin1/hugin/CPEditorPanel.cpp:1964
1739
 #, c-format
1740
-msgid "Removed %lu control points"
1741
-msgstr "Удалено %lu контрольных точек"
1742
+msgid "Removed %d control points"
1743
+msgstr "Удалено %d контрольных точек "
1744
 
1745
-#: hugin1/hugin/CPEditorPanel.cpp:2068 hugin1/hugin/PanoOperation.cpp:795
1746
+#: hugin1/hugin/CPEditorPanel.cpp:1964 hugin1/hugin/PanoOperation.cpp:795
1747
 msgid "Celeste result"
1748
 msgstr "Результат работы Celeste"
1749
 
1750
-#: hugin1/hugin/CPEditorPanel.cpp:2104 hugin1/hugin/PanoOperation.cpp:703
1751
-msgid "Cleaning"
1752
-msgstr "Очистка"
1753
-
1754
-#: hugin1/hugin/CPEditorPanel.cpp:2116
1755
-#, fuzzy
1756
-msgid "Create cp"
1757
-msgstr "Создание"
1758
-
1759
-#: hugin1/hugin/CPEditorPanel.cpp:2119
1760
-msgid ""
1761
-"Create control points for image pair with currently selected control point "
1762
-"detector on photos tab."
1763
-msgstr ""
1764
-
1765
-#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/cp_editor_panel.xrc:328
1766
-msgid "Celeste"
1767
-msgstr "Celeste"
1768
-
1769
-#: hugin1/hugin/CPEditorPanel.cpp:2130
1770
-msgid "Tries to remove control points from clouds"
1771
-msgstr "Пытается удалить контрольные точки из облаков"
1772
-
1773
-#: hugin1/hugin/CPEditorPanel.cpp:2138
1774
-#, fuzzy
1775
-msgid "Clean cp"
1776
-msgstr "Очистить задания"
1777
-
1778
-#: hugin1/hugin/CPEditorPanel.cpp:2141 hugin1/hugin/xrc/pref_dialog.xrc:301
1779
-msgid "Remove outlying control points by statistical method"
1780
-msgstr "Удалять наружные контрольные точки статистическим методом"
1781
-
1782
-#: hugin1/hugin/CPImageCtrl.cpp:592 hugin1/hugin/CPImageCtrl.cpp:754
1783
+#: hugin1/hugin/CPImageCtrl.cpp:597 hugin1/hugin/CPImageCtrl.cpp:759
1784
 msgid "new"
1785
 msgstr "новая"
1786
 
1787
-#: hugin1/hugin/CPImageCtrl.cpp:1454
1788
+#: hugin1/hugin/CPImageCtrl.cpp:1470
1789
 msgid "Could not process event!"
1790
 msgstr "Не удалось обработать событие!"
1791
 
1792
-#: hugin1/hugin/CPListFrame.cpp:92
1793
+#: hugin1/hugin/CPListFrame.cpp:96
1794
 msgid "G CP#"
1795
 msgstr "Глоб.№КТ"
1796
 
1797
-#: hugin1/hugin/CPListFrame.cpp:93
1798
+#: hugin1/hugin/CPListFrame.cpp:97
1799
 msgid "Left Img."
1800
 msgstr "Снимок слева"
1801
 
1802
-#: hugin1/hugin/CPListFrame.cpp:94
1803
+#: hugin1/hugin/CPListFrame.cpp:98
1804
 msgid "Right Img."
1805
 msgstr "Снимок справа"
1806
 
1807
-#: hugin1/hugin/CPListFrame.cpp:95
1808
+#: hugin1/hugin/CPListFrame.cpp:99
1809
 msgid "P CP#"
1810
 msgstr "Лок.№КТ"
1811
 
1812
@@ -1549,7 +1385,7 @@
1813
 msgid "Drag to move."
1814
 msgstr "Потащите для перемещения."
1815
 
1816
-#: hugin1/hugin/DragTool.cpp:358
1817
+#: hugin1/hugin/DragTool.cpp:359
1818
 msgid ""
1819
 "Drag to move images (optionally use shift to constrain), or roll with right-"
1820
 "drag or ctrl-drag."
1821
@@ -1558,176 +1394,218 @@
1822
 "поворота вокруг оси с перетаскиванием правой кнопкой мыши или Ctrl"
1823
 "+перетаскиванием."
1824
 
1825
-#: hugin1/hugin/GLPreviewFrame.cpp:323 hugin1/hugin/GLPreviewFrame.cpp:3148
1826
+#: hugin1/hugin/GLPreviewFrame.cpp:321 hugin1/hugin/GLPreviewFrame.cpp:3087
1827
 msgid "Fast Panorama preview"
1828
 msgstr "Быстрый предпросмотр панорамы"
1829
 
1830
-#: hugin1/hugin/GLPreviewFrame.cpp:376 hugin1/hugin/xrc/preview_frame.xrc:8
1831
-#: hugin1/hugin/xrc/preview_frame.xrc:1489
1832
+#: hugin1/hugin/GLPreviewFrame.cpp:374 translations/xrc.cpp:842
1833
+#: translations/xrc.cpp:995
1834
 msgid "Center"
1835
 msgstr "По центру"
1836
 
1837
-#: hugin1/hugin/GLPreviewFrame.cpp:377 hugin1/hugin/GLPreviewFrame.cpp:379
1838
-#: hugin1/hugin/xrc/preview_frame.xrc:14
1839
-#: hugin1/hugin/xrc/preview_frame.xrc:1384
1840
-#: hugin1/hugin/xrc/preview_frame.xrc:1501
1841
+#: hugin1/hugin/GLPreviewFrame.cpp:375 hugin1/hugin/GLPreviewFrame.cpp:377
1842
+#: translations/xrc.cpp:845 translations/xrc.cpp:983 translations/xrc.cpp:997
1843
 msgid "Fit"
1844
 msgstr "Уместить"
1845
 
1846
-#: hugin1/hugin/GLPreviewFrame.cpp:378 hugin1/hugin/xrc/preview_frame.xrc:19
1847
-#: hugin1/hugin/xrc/preview_frame.xrc:1513
1848
+#: hugin1/hugin/GLPreviewFrame.cpp:376 translations/xrc.cpp:847
1849
+#: translations/xrc.cpp:999
1850
 msgid "Straighten"
1851
 msgstr "Выпрямить"
1852
 
1853
-#: hugin1/hugin/GLPreviewFrame.cpp:380 hugin1/hugin/GLPreviewFrame.cpp:2609
1854
-#: hugin1/hugin/GLPreviewFrame.cpp:2639 hugin1/hugin/PanoPanel.cpp:1006
1855
-#: hugin1/hugin/xrc/preview_frame.xrc:1688
1856
+#: hugin1/hugin/GLPreviewFrame.cpp:378 hugin1/hugin/GLPreviewFrame.cpp:2557
1857
+#: hugin1/hugin/GLPreviewFrame.cpp:2587 hugin1/hugin/PanoPanel.cpp:966
1858
+#: translations/xrc.cpp:1019
1859
 msgid "Autocrop"
1860
 msgstr "Автообрезка"
1861
 
1862
-#: hugin1/hugin/GLPreviewFrame.cpp:381 hugin1/hugin/xrc/preview_frame.xrc:1700
1863
+#: hugin1/hugin/GLPreviewFrame.cpp:379 translations/xrc.cpp:1021
1864
 msgid "HDR Autocrop"
1865
 msgstr "HDR Автообрезка"
1866
 
1867
-#: hugin1/hugin/GLPreviewFrame.cpp:398 hugin1/hugin/GLPreviewFrame.cpp:3134
1868
-#: hugin1/hugin/GLPreviewFrame.cpp:3146 hugin1/hugin/MainFrame.cpp:363
1869
-#: hugin1/hugin/MainFrame.cpp:2019 hugin1/hugin/MainFrame.cpp:2037
1870
-#: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:459
1871
-#: hugin1/hugin/xrc/main_menu.xrc:225 hugin1/hugin/xrc/main_menu.xrc:250
1872
-#: hugin1/hugin/xrc/preview_frame.xrc:1967
1873
-#: hugin1/hugin/xrc/preview_frame.xrc:1997
1874
+#: hugin1/hugin/GLPreviewFrame.cpp:394 hugin1/hugin/GLPreviewFrame.cpp:3074
1875
+#: hugin1/hugin/MainFrame.cpp:361 hugin1/hugin/MainFrame.cpp:1938
1876
+#: hugin1/hugin/MainFrame.cpp:1956 translations/xrc.cpp:65
1877
+#: translations/xrc.cpp:298 translations/xrc.cpp:429 translations/xrc.cpp:439
1878
+#: translations/xrc.cpp:1084
1879
 msgid "&File"
1880
 msgstr "&Файл"
1881
 
1882
-#: hugin1/hugin/GLPreviewFrame.cpp:417 hugin1/hugin/PreviewFrame.cpp:137
1883
+#: hugin1/hugin/GLPreviewFrame.cpp:413 hugin1/hugin/PreviewFrame.cpp:139
1884
 msgid "displayed images"
1885
 msgstr "отображаемые снимки"
1886
 
1887
-#: hugin1/hugin/GLPreviewFrame.cpp:431 hugin1/hugin/xrc/preview_frame.xrc:42
1888
+#: hugin1/hugin/GLPreviewFrame.cpp:430 hugin1/hugin/GLPreviewFrame.cpp:443
1889
+#: translations/xrc.cpp:855
1890
 msgid "All"
1891
 msgstr "Все"
1892
 
1893
-#: hugin1/hugin/GLPreviewFrame.cpp:472 hugin1/hugin/GLPreviewFrame.cpp:478
1894
-#: hugin1/hugin/ImagesPanel.cpp:688 hugin1/hugin/xrc/pano_panel.xrc:533
1895
-#: hugin1/hugin/xrc/pano_panel.xrc:590 hugin1/hugin/xrc/pano_panel.xrc:1175
1896
-#: hugin1/hugin/xrc/pano_panel.xrc:1222 hugin1/hugin/xrc/pref_dialog.xrc:769
1897
-#: hugin1/hugin/xrc/preview_frame.xrc:47 hugin1/hugin/xrc/preview_frame.xrc:604
1898
-#: hugin1/hugin/xrc/preview_frame.xrc:682
1899
-#: hugin1/hugin/xrc/preview_frame.xrc:850
1900
-#: hugin1/hugin/xrc/preview_frame.xrc:1462
1901
-#: hugin1/hugin/xrc/preview_frame.xrc:1552
1902
-#: hugin1/hugin/xrc/preview_frame.xrc:1728
1903
+#: hugin1/hugin/GLPreviewFrame.cpp:438 hugin1/hugin/GLPreviewFrame.cpp:444
1904
+#: hugin1/hugin/ImagesPanel.cpp:679 translations/xrc.cpp:589
1905
+#: translations/xrc.cpp:594 translations/xrc.cpp:651 translations/xrc.cpp:654
1906
+#: translations/xrc.cpp:742 translations/xrc.cpp:857 translations/xrc.cpp:902
1907
+#: translations/xrc.cpp:914 translations/xrc.cpp:933 translations/xrc.cpp:988
1908
+#: translations/xrc.cpp:1003 translations/xrc.cpp:1024
1909
 msgid "None"
1910
 msgstr "Нет"
1911
 
1912
-#: hugin1/hugin/GLPreviewFrame.cpp:493
1913
+#: hugin1/hugin/GLPreviewFrame.cpp:459
1914
 msgid "Hide"
1915
 msgstr "Скрыть"
1916
 
1917
-#: hugin1/hugin/GLPreviewFrame.cpp:542 hugin1/hugin/PreviewFrame.cpp:174
1918
+#: hugin1/hugin/GLPreviewFrame.cpp:508 hugin1/hugin/PreviewFrame.cpp:176
1919
 msgid "VFOV"
1920
 msgstr "ВертПЗ"
1921
 
1922
-#: hugin1/hugin/GLPreviewFrame.cpp:550 hugin1/hugin/PreviewFrame.cpp:182
1923
+#: hugin1/hugin/GLPreviewFrame.cpp:516 hugin1/hugin/PreviewFrame.cpp:184
1924
 msgid "drag to change the vertical field of view"
1925
 msgstr "Перетащите для смены вертикального поля зрения"
1926
 
1927
-#: hugin1/hugin/GLPreviewFrame.cpp:559 hugin1/hugin/PreviewFrame.cpp:191
1928
+#: hugin1/hugin/GLPreviewFrame.cpp:525 hugin1/hugin/PreviewFrame.cpp:193
1929
 msgid "HFOV"
1930
 msgstr "ГорПЗ"
1931
 
1932
-#: hugin1/hugin/GLPreviewFrame.cpp:568 hugin1/hugin/PreviewFrame.cpp:200
1933
+#: hugin1/hugin/GLPreviewFrame.cpp:534 hugin1/hugin/PreviewFrame.cpp:202
1934
 msgid "drag to change the horizontal field of view"
1935
 msgstr "Перетащите для изменения горизонтального поля зрения"
1936
 
1937
-#: hugin1/hugin/GLPreviewFrame.cpp:626 hugin1/hugin/xrc/lenscal_frame.xrc:434
1938
-#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:475
1939
-#: hugin1/hugin/xrc/preview_frame.xrc:1329
1940
+#: hugin1/hugin/GLPreviewFrame.cpp:589 translations/xrc.cpp:294
1941
+#: translations/xrc.cpp:468 translations/xrc.cpp:893 translations/xrc.cpp:978
1942
 msgid "Preview"
1943
 msgstr "Предпросмотр"
1944
 
1945
-#: hugin1/hugin/GLPreviewFrame.cpp:639
1946
+#: hugin1/hugin/GLPreviewFrame.cpp:602
1947
 msgid "Overview"
1948
 msgstr "Обзор"
1949
 
1950
-#: hugin1/hugin/GLPreviewFrame.cpp:750 hugin1/hugin/PreviewFrame.cpp:314
1951
+#: hugin1/hugin/GLPreviewFrame.cpp:713 hugin1/hugin/PreviewFrame.cpp:316
1952
 msgid "Resets the projection's parameters to their default values."
1953
 msgstr "Сбросить параметры проекций до значений по умолчанию."
1954
 
1955
-#: hugin1/hugin/GLPreviewFrame.cpp:760 hugin1/hugin/PreviewFrame.cpp:323
1956
+#: hugin1/hugin/GLPreviewFrame.cpp:722 hugin1/hugin/PreviewFrame.cpp:325
1957
 msgid "param:"
1958
 msgstr "парам.:"
1959
 
1960
-#: hugin1/hugin/GLPreviewFrame.cpp:1059
1961
+#: hugin1/hugin/GLPreviewFrame.cpp:1015
1962
 msgid "No images loaded."
1963
 msgstr "Ни один снимок не загружен."
1964
 
1965
-#: hugin1/hugin/GLPreviewFrame.cpp:1094
1966
+#: hugin1/hugin/GLPreviewFrame.cpp:1050
1967
 #, c-format
1968
 msgid "%lu images loaded."
1969
 msgstr "%lu снимков загружено."
1970
 
1971
-#: hugin1/hugin/GLPreviewFrame.cpp:1110
1972
+#: hugin1/hugin/GLPreviewFrame.cpp:1066
1973
 #, c-format
1974
 msgid "Images are connected by %lu control points.\n"
1975
 msgstr "Снимки связаны %lu контрольными точками.\n"
1976
 
1977
-#: hugin1/hugin/GLPreviewFrame.cpp:1119
1978
-#, fuzzy, c-format
1979
-msgid "%lu unconnected image groups found: %s\n"
1980
+#: hugin1/hugin/GLPreviewFrame.cpp:1077
1981
+#, c-format
1982
+msgid "%d unconnected image groups found: "
1983
 msgstr "%d несвязанных групп снимков:"
1984
 
1985
-#: hugin1/hugin/GLPreviewFrame.cpp:1125
1986
+#: hugin1/hugin/GLPreviewFrame.cpp:1078
1987
+msgid ""
1988
+"Please use the Control Points tab to connect all images with control "
1989
+"points.\n"
1990
+msgstr ""
1991
+"Воспользуйтесь вкладкой «Контрольные точки», чтобы объединить снимки "
1992
+"контрольными точками.\n"
1993
+
1994
+#: hugin1/hugin/GLPreviewFrame.cpp:1084
1995
 msgid "Images or control points have changed, new alignment is needed."
1996
 msgstr ""
1997
 "Снимки или контрольные точки изменились, требуется повторное выравнивание."
1998
 
1999
-#: hugin1/hugin/GLPreviewFrame.cpp:1136
2000
-#, fuzzy, c-format
2001
-msgid "Mean error after optimization: %.1f pixel, max: %.1f"
2002
+#: hugin1/hugin/GLPreviewFrame.cpp:1097
2003
+msgid "Very good fit."
2004
+msgstr "Очень хорошее совпадение."
2005
+
2006
+#: hugin1/hugin/GLPreviewFrame.cpp:1099
2007
+msgid "Good fit."
2008
+msgstr "Хорошее совпадение."
2009
+
2010
+#: hugin1/hugin/GLPreviewFrame.cpp:1101
2011
+msgid ""
2012
+"Bad fit, some control points might be bad, or there are parallax and "
2013
+"movement errors"
2014
+msgstr ""
2015
+"Плохое совпадение, некоторые контрольные точки расставлены неправильно, либо "
2016
+"присутствуют погрешности параллакса или движения."
2017
+
2018
+#: hugin1/hugin/GLPreviewFrame.cpp:1103
2019
+msgid ""
2020
+"Very bad fit. Check for bad control points, lens parameters, or images with "
2021
+"parallax or movement. The optimizer might have failed. Manual intervention "
2022
+"required."
2023
+msgstr ""
2024
+"Очень плохое совпадение. Проверьте, нет ли несовпадающих контрольных точек, "
2025
+"некорректных параметров объектива или снимков с параллаксом или движением. "
2026
+"Оптимизировать панораму не удалось. Требуется ручное вмешательство."
2027
+
2028
+#: hugin1/hugin/GLPreviewFrame.cpp:1105
2029
+#, c-format
2030
+msgid "Mean error after optimization: %.1f pixel, max: %.1f\n"
2031
 msgstr "Средняя погрешность после оптимизации: %.1f пикселов, макс.: %.1f\n"
2032
 
2033
-#: hugin1/hugin/GLPreviewFrame.cpp:1566 hugin1/hugin/PreviewFrame.cpp:641
2034
+#: hugin1/hugin/GLPreviewFrame.cpp:1115
2035
+msgid ""
2036
+"Note: automatic alignment uses default settings from the preferences. If you "
2037
+"want to use customized settings, run the CP detection, the geometrical "
2038
+"optimization and the photometric optimization from the Photos tab in the "
2039
+"panorama editor."
2040
+msgstr ""
2041
+"Внимание: при автоматическом выравнивании используются параметры, указанные "
2042
+"в диалоге параметров программы.\n"
2043
+"Если вы сами изменили какие-то параметры в других вкладках основного окна "
2044
+"программы и хотите использовать\n"
2045
+"эти изменённые параметры, запустите определение контрольных точек с вкладки "
2046
+"«Снимки»,\n"
2047
+"геометрическую оптимизацию — с вкладки «Оптимизация», и фотометрическую "
2048
+"оптимизацию — с вкладки «Экспозиция»."
2049
+
2050
+#: hugin1/hugin/GLPreviewFrame.cpp:1534 hugin1/hugin/PreviewFrame.cpp:645
2051
 msgid "Rectilinear"
2052
 msgstr "Прямолинейная"
2053
 
2054
-#: hugin1/hugin/GLPreviewFrame.cpp:1567 hugin1/hugin/PreviewFrame.cpp:642
2055
+#: hugin1/hugin/GLPreviewFrame.cpp:1535 hugin1/hugin/PreviewFrame.cpp:646
2056
 msgid "Cylindrical"
2057
 msgstr "Цилиндрическая"
2058
 
2059
-#: hugin1/hugin/GLPreviewFrame.cpp:1688 hugin1/hugin/PreviewFrame.cpp:745
2060
+#: hugin1/hugin/GLPreviewFrame.cpp:1632 hugin1/hugin/PreviewFrame.cpp:749
2061
 msgid "Yaw value must be numeric."
2062
 msgstr "Значение поворота вокруг вертикали должно быть числом."
2063
 
2064
-#: hugin1/hugin/GLPreviewFrame.cpp:1695 hugin1/hugin/PreviewFrame.cpp:751
2065
+#: hugin1/hugin/GLPreviewFrame.cpp:1639 hugin1/hugin/PreviewFrame.cpp:755
2066
 msgid "Pitch value must be numeric."
2067
 msgstr "Значение наклона горизонта должно быть числом"
2068
 
2069
-#: hugin1/hugin/GLPreviewFrame.cpp:1702 hugin1/hugin/PreviewFrame.cpp:757
2070
+#: hugin1/hugin/GLPreviewFrame.cpp:1646 hugin1/hugin/PreviewFrame.cpp:761
2071
 msgid "Roll value must be numeric."
2072
 msgstr "Значение поворота вокруг оси должно быть числом"
2073
 
2074
-#: hugin1/hugin/GLPreviewFrame.cpp:1716
2075
+#: hugin1/hugin/GLPreviewFrame.cpp:1660
2076
 msgid "X value must be numeric."
2077
 msgstr "Значение X должно быть числом."
2078
 
2079
-#: hugin1/hugin/GLPreviewFrame.cpp:1723
2080
+#: hugin1/hugin/GLPreviewFrame.cpp:1667
2081
 msgid "Y value must be numeric."
2082
 msgstr "Значение Y должно быть числом."
2083
 
2084
-#: hugin1/hugin/GLPreviewFrame.cpp:1730
2085
+#: hugin1/hugin/GLPreviewFrame.cpp:1674
2086
 msgid "Z value must be numeric."
2087
 msgstr "Значение Z должно быть числом."
2088
 
2089
-#: hugin1/hugin/GLPreviewFrame.cpp:1749 hugin1/hugin/GLPreviewFrame.cpp:1771
2090
-#: hugin1/hugin/GLPreviewFrame.cpp:2863 hugin1/hugin/GLPreviewFrame.cpp:2894
2091
-#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:619
2092
-#: hugin1/hugin/PanoPanel.cpp:650 hugin1/hugin/PreviewFrame.cpp:780
2093
-#: hugin1/hugin/PreviewFrame.cpp:795
2094
+#: hugin1/hugin/GLPreviewFrame.cpp:1693 hugin1/hugin/GLPreviewFrame.cpp:1715
2095
+#: hugin1/hugin/GLPreviewFrame.cpp:2804 hugin1/hugin/GLPreviewFrame.cpp:2835
2096
+#: hugin1/hugin/ImageVariableDialog.cpp:224 hugin1/hugin/PanoPanel.cpp:622
2097
+#: hugin1/hugin/PanoPanel.cpp:653 hugin1/hugin/PreviewFrame.cpp:784
2098
+#: hugin1/hugin/PreviewFrame.cpp:799
2099
 msgid "Value must be numeric."
2100
 msgstr "Значение должно быть числом"
2101
 
2102
-#: hugin1/hugin/GLPreviewFrame.cpp:1888 hugin1/hugin/GLPreviewFrame.cpp:1977
2103
+#: hugin1/hugin/GLPreviewFrame.cpp:1833 hugin1/hugin/GLPreviewFrame.cpp:1922
2104
 msgid ""
2105
 "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and "
2106
 "pitch=0.\n"
2107
@@ -1735,53 +1613,53 @@
2108
 "Should the Tpy and Tpp parameters reset to zero?"
2109
 msgstr ""
2110
 
2111
-#: hugin1/hugin/GLPreviewFrame.cpp:2583 hugin1/hugin/PreviewFrame.cpp:245
2112
+#: hugin1/hugin/GLPreviewFrame.cpp:2531 hugin1/hugin/PreviewFrame.cpp:247
2113
 msgid "difference"
2114
 msgstr "Разница"
2115
 
2116
-#: hugin1/hugin/GLPreviewFrame.cpp:2609 hugin1/hugin/GLPreviewFrame.cpp:2639
2117
-#: hugin1/hugin/PanoPanel.cpp:1006
2118
+#: hugin1/hugin/GLPreviewFrame.cpp:2557 hugin1/hugin/GLPreviewFrame.cpp:2587
2119
+#: hugin1/hugin/PanoPanel.cpp:966
2120
 msgid "Calculating optimal crop"
2121
 msgstr "Вычисляется оптимальная обрезка"
2122
 
2123
-#: hugin1/hugin/GLPreviewFrame.cpp:2809 hugin1/hugin/PanoPanel.cpp:729
2124
+#: hugin1/hugin/GLPreviewFrame.cpp:2750 hugin1/hugin/PanoPanel.cpp:732
2125
 msgid "Top needs to be an integer bigger than 0"
2126
 msgstr "Верх должен быть целым числом больше 0"
2127
 
2128
-#: hugin1/hugin/GLPreviewFrame.cpp:2813 hugin1/hugin/PanoPanel.cpp:733
2129
+#: hugin1/hugin/GLPreviewFrame.cpp:2754 hugin1/hugin/PanoPanel.cpp:736
2130
 msgid "left needs to be an integer bigger than 0"
2131
 msgstr "слева должен быть целым числом больше 0"
2132
 
2133
-#: hugin1/hugin/GLPreviewFrame.cpp:2817 hugin1/hugin/PanoPanel.cpp:737
2134
+#: hugin1/hugin/GLPreviewFrame.cpp:2758 hugin1/hugin/PanoPanel.cpp:740
2135
 msgid "right needs to be an integer bigger than 0"
2136
 msgstr "справа должен быть целым числом больше 0"
2137
 
2138
-#: hugin1/hugin/GLPreviewFrame.cpp:2821 hugin1/hugin/PanoPanel.cpp:741
2139
+#: hugin1/hugin/GLPreviewFrame.cpp:2762 hugin1/hugin/PanoPanel.cpp:744
2140
 msgid "bottom needs to be an integer bigger than 0"
2141
 msgstr "низ должен быть целым числом больше 0"
2142
 
2143
-#: hugin1/hugin/GLPreviewFrame.cpp:2827
2144
+#: hugin1/hugin/GLPreviewFrame.cpp:2768
2145
 msgid "left boundary must be smaller than right"
2146
 msgstr "левая граница должна быть меньше правой"
2147
 
2148
-#: hugin1/hugin/GLPreviewFrame.cpp:2833
2149
+#: hugin1/hugin/GLPreviewFrame.cpp:2774
2150
 msgid "top boundary must be smaller than bottom"
2151
 msgstr "верхняя граница должна быть меньше нижней"
2152
 
2153
-#: hugin1/hugin/GLPreviewFrame.cpp:2869 hugin1/hugin/PanoPanel.cpp:625
2154
+#: hugin1/hugin/GLPreviewFrame.cpp:2810 hugin1/hugin/PanoPanel.cpp:628
2155
 #, c-format
2156
 msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf."
2157
 msgstr ""
2158
 "Некорректное значение ГорПЗ. Максимально ГорПЗ для этой проекции равно %lf."
2159
 
2160
-#: hugin1/hugin/GLPreviewFrame.cpp:2900 hugin1/hugin/PanoPanel.cpp:656
2161
+#: hugin1/hugin/GLPreviewFrame.cpp:2841 hugin1/hugin/PanoPanel.cpp:659
2162
 #, c-format
2163
 msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf."
2164
 msgstr ""
2165
 "Некорректное значение ВертПЗ. Максимальное ВертПЗ для этой проекции равно "
2166
 "%lf."
2167
 
2168
-#: hugin1/hugin/GLPreviewFrame.cpp:2938
2169
+#: hugin1/hugin/GLPreviewFrame.cpp:2879
2170
 msgid ""
2171
 "With a wide field of view, panoramas with rectilinear projection get very "
2172
 "stretched towards the edges.\n"
2173
@@ -1789,7 +1667,7 @@
2174
 "С широким углом обзора, панорамы с прямолинейной проекцией очень растянута "
2175
 "по краям.\n"
2176
 
2177
-#: hugin1/hugin/GLPreviewFrame.cpp:2940
2178
+#: hugin1/hugin/GLPreviewFrame.cpp:2881
2179
 msgid ""
2180
 "Since the field of view is only very wide in the horizontal direction, try a "
2181
 "cylindrical projection instead."
2182
@@ -1797,15 +1675,15 @@
2183
 "Поскольку угол обзора очень широк только в горизонтальном направлении, "
2184
 "попробуйте вместо этого цилиндрическую проекцию."
2185
 
2186
-#: hugin1/hugin/GLPreviewFrame.cpp:2942
2187
+#: hugin1/hugin/GLPreviewFrame.cpp:2883
2188
 msgid "For a very wide panorama, try equirectangular projection instead."
2189
 msgstr "Для очень широкой панорамы попробуйте эквидистантную проекцию."
2190
 
2191
-#: hugin1/hugin/GLPreviewFrame.cpp:2944
2192
+#: hugin1/hugin/GLPreviewFrame.cpp:2885
2193
 msgid " You could also try Panini projection."
2194
 msgstr "Вы можете попробовать и проекцию Панини."
2195
 
2196
-#: hugin1/hugin/GLPreviewFrame.cpp:2949
2197
+#: hugin1/hugin/GLPreviewFrame.cpp:2890
2198
 msgid ""
2199
 "With a wide vertical field of view, panoramas with cylindrical projection "
2200
 "get very stretched at the top and bottom.\n"
2201
@@ -1817,7 +1695,7 @@
2202
 "Эквидистантная проекция уместила бы то же самое содержимое в меньшее "
2203
 "вертикальное пространство."
2204
 
2205
-#: hugin1/hugin/GLPreviewFrame.cpp:2955
2206
+#: hugin1/hugin/GLPreviewFrame.cpp:2896
2207
 msgid ""
2208
 "Since the vertical field of view is not too wide, you could try setting the "
2209
 "panorama projection to cylindrical.\n"
2210
@@ -1828,7 +1706,7 @@
2211
 "Цилиндрическая проекция сохраняет вертикальные линии, в отличие от "
2212
 "эквидистантной."
2213
 
2214
-#: hugin1/hugin/GLPreviewFrame.cpp:2961
2215
+#: hugin1/hugin/GLPreviewFrame.cpp:2902
2216
 msgid ""
2217
 "Stereographic projection is conformal, unlike this Fisheye panorama "
2218
 "projection.\n"
2219
@@ -1839,7 +1717,7 @@
2220
 "РыбийГлаз.\n"
2221
 "Она сохраняет углы вокруг точки, что облегчает зрительное восприятие."
2222
 
2223
-#: hugin1/hugin/GLPreviewFrame.cpp:2966
2224
+#: hugin1/hugin/GLPreviewFrame.cpp:2907
2225
 msgid ""
2226
 "Panoramas with stereographic projection and a very wide field of view "
2227
 "stretch the image around the edges a lot.\n"
2228
@@ -1851,13 +1729,13 @@
2229
 "Панорама с проекцией РыбийГлаз  сжимает его, так что вы можете уместиться в "
2230
 "широкое поле обзора и при этом иметь разумное покрытие по центру."
2231
 
2232
-#: hugin1/hugin/GLPreviewFrame.cpp:2973
2233
+#: hugin1/hugin/GLPreviewFrame.cpp:2914
2234
 msgid ""
2235
 "Setting the panorama to rectilinear projection would keep the straight lines "
2236
 "straight."
2237
 msgstr "Установка панорамы на прямолинейную проекцию сохранит прямые линии."
2238
 
2239
-#: hugin1/hugin/GLPreviewFrame.cpp:3015
2240
+#: hugin1/hugin/GLPreviewFrame.cpp:2956
2241
 msgid ""
2242
 "You have hidden the infobar, which shows hints about selection of "
2243
 "projection.\n"
2244
@@ -1866,52 +1744,59 @@
2245
 "У вас есть скрытая информационная панель, которая показывает подсказки. \n"
2246
 "Если вы хотите увидеть её снова, активируйте панель в настройках."
2247
 
2248
-#: hugin1/hugin/GLPreviewFrame.cpp:3085
2249
+#: hugin1/hugin/GLPreviewFrame.cpp:3026
2250
 msgid "normal, individual"
2251
 msgstr "нормальный, настраиваемый"
2252
 
2253
-#: hugin1/hugin/GLPreviewFrame.cpp:3088
2254
+#: hugin1/hugin/GLPreviewFrame.cpp:3029
2255
 msgid "mosaic"
2256
 msgstr "мозаичный"
2257
 
2258
-#: hugin1/hugin/GLPreviewFrame.cpp:3089
2259
+#: hugin1/hugin/GLPreviewFrame.cpp:3030
2260
 msgid "mosaic, individual"
2261
 msgstr "мозаичный, настраиваемый"
2262
 
2263
-#: hugin1/hugin/GLPreviewFrame.cpp:3109
2264
+#: hugin1/hugin/GLPreviewFrame.cpp:3050
2265
 msgid "Panosphere"
2266
 msgstr "Паносфера"
2267
 
2268
-#: hugin1/hugin/GLPreviewFrame.cpp:3112
2269
+#: hugin1/hugin/GLPreviewFrame.cpp:3053
2270
 msgid "Mosaic plane"
2271
 msgstr "Мозаика"
2272
 
2273
-#: hugin1/hugin/GLPreviewFrame.cpp:3326
2274
+#: hugin1/hugin/GLPreviewFrame.cpp:3265
2275
 #, c-format
2276
 msgid ""
2277
 "%lu control points were removed from the panorama.\n"
2278
 "\n"
2279
 "Should the panorama now be re-optimized?"
2280
 msgstr ""
2281
+"Из панорамы было удалено %lu контрольных точек.\n"
2282
+"\n"
2283
+"Следует ли перезапустить оптимизацию панорамы?"
2284
 
2285
-#: hugin1/hugin/GLPreviewFrame.cpp:3327 hugin1/hugin/GLPreviewFrame.cpp:3624
2286
+#: hugin1/hugin/GLPreviewFrame.cpp:3266 hugin1/hugin/GLPreviewFrame.cpp:3562
2287
 #, c-format
2288
 msgid "Current selected optimizer strategy is \"%s\"."
2289
-msgstr ""
2290
+msgstr "В данный момент выбрана стратегия оптимизации \"%s\"."
2291
 
2292
-#: hugin1/hugin/GLPreviewFrame.cpp:3377
2293
+#: hugin1/hugin/GLPreviewFrame.cpp:3316
2294
 msgid ""
2295
 "The selected region contains no active image.\n"
2296
 "Please select a region which is covered by at least 2 images."
2297
 msgstr ""
2298
+"Выбранная область не содержит активных снимков.\n"
2299
+"Пожалуйста, выберите область, покрываемую хотя бы двумя снимками."
2300
 
2301
-#: hugin1/hugin/GLPreviewFrame.cpp:3388
2302
+#: hugin1/hugin/GLPreviewFrame.cpp:3327
2303
 msgid ""
2304
 "The selected region is only covered by a single image.\n"
2305
 "Can't create control points for a single image."
2306
 msgstr ""
2307
+"Выбранная область покрывается только одним снимком.\n"
2308
+"Невозможно создать контрольные точки для одиночного снимка."
2309
 
2310
-#: hugin1/hugin/GLPreviewFrame.cpp:3399
2311
+#: hugin1/hugin/GLPreviewFrame.cpp:3338
2312
 msgid ""
2313
 "The selected rectangle is very big.\n"
2314
 "This function is only intended for smaller areas. Otherwise unwanted side "
2315
@@ -1919,40 +1804,45 @@
2316
 "\n"
2317
 "Proceed anyway?"
2318
 msgstr ""
2319
+"Выделенный прямоугольник слишком большой.\n"
2320
+"Эта функция предназначена для использования с меньшими областями. В противном случае могут "
2321
+"возникнуть нежелательные побочные эффекты.\n"
2322
+"\n"
2323
+"Вы уверены, что хотите продолжить?"
2324
 
2325
-#: hugin1/hugin/GLPreviewFrame.cpp:3424 hugin1/hugin/PapywizardImport.cpp:467
2326
-#, fuzzy
2327
+#: hugin1/hugin/GLPreviewFrame.cpp:3363
2328
 msgid "Searching control points"
2329
-msgstr "Очистить контрольные точки"
2330
+msgstr "Поиск контрольных точек"
2331
 
2332
-#: hugin1/hugin/GLPreviewFrame.cpp:3424
2333
-#, fuzzy
2334
+#: hugin1/hugin/GLPreviewFrame.cpp:3363
2335
 msgid "Processing"
2336
-msgstr "Обработка:"
2337
+msgstr "Обработка"
2338
 
2339
-#: hugin1/hugin/GLPreviewFrame.cpp:3431
2340
+#: hugin1/hugin/GLPreviewFrame.cpp:3370
2341
 msgid "Remap image to panorama projection..."
2342
 msgstr ""
2343
 
2344
-#: hugin1/hugin/GLPreviewFrame.cpp:3477
2345
+#: hugin1/hugin/GLPreviewFrame.cpp:3415
2346
 #, fuzzy
2347
 msgid "Matching interest points..."
2348
 msgstr "поиск похожих точек..."
2349
 
2350
-#: hugin1/hugin/GLPreviewFrame.cpp:3596
2351
-#, fuzzy
2352
+#: hugin1/hugin/GLPreviewFrame.cpp:3534
2353
 msgid "Checking results..."
2354
-msgstr "Проверка попарно"
2355
+msgstr "Проверка результатов..."
2356
 
2357
-#: hugin1/hugin/GLPreviewFrame.cpp:3623
2358
+#: hugin1/hugin/GLPreviewFrame.cpp:3561
2359
 #, c-format
2360
 msgid ""
2361
 "%lu control points were added to the panorama.\n"
2362
 "\n"
2363
 "Should the panorama now be re-optimized?"
2364
 msgstr ""
2365
+"К панораме было добавлено %lu контрольных точек.\n"
2366
+"\n"
2367
+"Следует ли перезапустить оптимизацию панорамы?"
2368
 
2369
-#: hugin1/hugin/GLViewer.cpp:155
2370
+#: hugin1/hugin/GLViewer.cpp:288
2371
 msgid ""
2372
 "Error initializing GLEW\n"
2373
 "Fast preview window can not be opened."
2374
@@ -1960,7 +1850,7 @@
2375
 "Ошибка инициализации GLEW.\n"
2376
 "Окно быстрого предпросмотра не может быть открыто."
2377
 
2378
-#: hugin1/hugin/GLViewer.cpp:167
2379
+#: hugin1/hugin/GLViewer.cpp:300
2380
 msgid ""
2381
 "Sorry, the fast preview window requires a system which supports OpenGL "
2382
 "version 1.1 with the GL_ARB_multitexture extension.\n"
2383
@@ -1998,468 +1888,463 @@
2384
 msgid "Wrong input"
2385
 msgstr "Неправильный ввод"
2386
 
2387
-#: hugin1/hugin/ImageVariableDialog.cpp:323
2388
+#: hugin1/hugin/ImageVariableDialog.cpp:325
2389
 msgid "Save graph"
2390
 msgstr "Сохранить граф"
2391
 
2392
-#: hugin1/hugin/ImageVariableDialog.cpp:325
2393
+#: hugin1/hugin/ImageVariableDialog.cpp:327
2394
 msgid "Bitmap (*.bmp)|*.bmp|PNG-File (*.png)|*.png"
2395
 msgstr "Файлы BMP (*.bmp)|*.bmp|Файлы PNG (*.png)|*.png"
2396
 
2397
-#: hugin1/hugin/ImageVariableDialog.cpp:351
2398
+#: hugin1/hugin/ImageVariableDialog.cpp:353
2399
 msgid "Save image"
2400
 msgstr "Сохранить снимок"
2401
 
2402
-#: hugin1/hugin/ImagesList.cpp:452 hugin1/hugin/ImagesList.cpp:512
2403
-#: hugin1/hugin/ImagesTree.cpp:140
2404
+#: hugin1/hugin/ImagesList.cpp:455 hugin1/hugin/ImagesList.cpp:515
2405
+#: hugin1/hugin/ImagesTree.cpp:143
2406
 msgid "Filename"
2407
 msgstr "Имя файла"
2408
 
2409
-#: hugin1/hugin/ImagesList.cpp:453 hugin1/hugin/ImagesList.cpp:513
2410
+#: hugin1/hugin/ImagesList.cpp:456 hugin1/hugin/ImagesList.cpp:516
2411
 msgid "Number of masks"
2412
 msgstr "Количество масок"
2413
 
2414
-#: hugin1/hugin/ImagesList.cpp:454 hugin1/hugin/ImagesList.cpp:514
2415
-#: hugin1/hugin/xrc/mask_editor_panel.xrc:340
2416
-#: hugin1/hugin/xrc/preview_frame.xrc:948
2417
-#: hugin1/hugin/xrc/preview_frame.xrc:1826
2418
+#: hugin1/hugin/ImagesList.cpp:457 hugin1/hugin/ImagesList.cpp:517
2419
+#: translations/xrc.cpp:503 translations/xrc.cpp:946 translations/xrc.cpp:1037
2420
 msgid "Crop"
2421
 msgstr "Обрезка"
2422
 
2423
-#: hugin1/hugin/ImagesPanel.cpp:323
2424
+#: hugin1/hugin/ImagesPanel.cpp:319
2425
 msgid "Enter maximal number of control points per image pair"
2426
 msgstr "Введите максимальное число контрольных точек для каждой пары снимков"
2427
 
2428
-#: hugin1/hugin/ImagesPanel.cpp:324
2429
+#: hugin1/hugin/ImagesPanel.cpp:320
2430
 msgid "Points per Overlap"
2431
 msgstr "Точек на перекрытие"
2432
 
2433
-#: hugin1/hugin/ImagesPanel.cpp:325
2434
+#: hugin1/hugin/ImagesPanel.cpp:321
2435
 msgid "Control point detector option"
2436
 msgstr "Опция поиска контрольных точек"
2437
 
2438
-#: hugin1/hugin/ImagesPanel.cpp:342
2439
+#: hugin1/hugin/ImagesPanel.cpp:339
2440
 #, c-format
2441
 msgid "Added %lu control points"
2442
 msgstr "Добавлено %lu контрольных точек"
2443
 
2444
-#: hugin1/hugin/ImagesPanel.cpp:342
2445
+#: hugin1/hugin/ImagesPanel.cpp:339
2446
 msgid "Control point detector result"
2447
 msgstr "Результат поиска контрольных точек"
2448
 
2449
-#: hugin1/hugin/ImagesPanel.cpp:630
2450
+#: hugin1/hugin/ImagesPanel.cpp:621
2451
 msgid "The minimum overlap has to be greater than 0 and smaller than 1."
2452
 msgstr "Минимальное перекрытие должно быть больше 0 и меньше 1."
2453
 
2454
-#: hugin1/hugin/ImagesPanel.cpp:664
2455
+#: hugin1/hugin/ImagesPanel.cpp:655
2456
 msgid "The maximum Ev difference has to be greater than 0."
2457
 msgstr "Максимальная разница EV должна быть больше 0."
2458
 
2459
-#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1192
2460
-#: hugin1/hugin/xrc/main_frame.xrc:351
2461
+#: hugin1/hugin/ImagesPanel.cpp:687 hugin1/hugin/ImagesTree.cpp:1181
2462
 msgid "Stacks"
2463
 msgstr "Стопки"
2464
 
2465
-#: hugin1/hugin/ImagesPanel.cpp:701
2466
+#: hugin1/hugin/ImagesPanel.cpp:692
2467
 msgid "Output layers"
2468
 msgstr "Выходные слои"
2469
 
2470
-#: hugin1/hugin/ImagesPanel.cpp:704
2471
+#: hugin1/hugin/ImagesPanel.cpp:695
2472
 msgid "Output stacks"
2473
 msgstr "Выходные стопки"
2474
 
2475
-#: hugin1/hugin/ImagesPanel.cpp:722
2476
+#: hugin1/hugin/ImagesPanel.cpp:713
2477
 msgid "Positions (incremental, starting from anchor)"
2478
 msgstr "Позиции (с приращением, начиная с фиксированного снимка)"
2479
 
2480
-#: hugin1/hugin/ImagesPanel.cpp:725
2481
+#: hugin1/hugin/ImagesPanel.cpp:716
2482
 msgid "Positions (y,p,r)"
2483
 msgstr "Позиции (y,p,r)"
2484
 
2485
-#: hugin1/hugin/ImagesPanel.cpp:728
2486
+#: hugin1/hugin/ImagesPanel.cpp:719
2487
 msgid "Positions and View (y,p,r,v)"
2488
 msgstr "Позиции и вид (y,p,r,v)"
2489
 
2490
-#: hugin1/hugin/ImagesPanel.cpp:731
2491
+#: hugin1/hugin/ImagesPanel.cpp:722
2492
 msgid "Positions and Barrel Distortion (y,p,r,b)"
2493
 msgstr "Позиции и «бочку» (y,p,r,b)"
2494
 
2495
-#: hugin1/hugin/ImagesPanel.cpp:734
2496
+#: hugin1/hugin/ImagesPanel.cpp:725
2497
 msgid "Positions, View and Barrel (y,p,r,v,b)"
2498
 msgstr "Позиции, вид и «бочку» (y,p,r,v,b)"
2499
 
2500
-#: hugin1/hugin/ImagesPanel.cpp:739
2501
+#: hugin1/hugin/ImagesPanel.cpp:730
2502
 msgid "Everything without translation"
2503
 msgstr "Всё без переноса"
2504
 
2505
-#: hugin1/hugin/ImagesPanel.cpp:743
2506
+#: hugin1/hugin/ImagesPanel.cpp:734
2507
 msgid "Everything"
2508
 msgstr "Всё"
2509
 
2510
-#: hugin1/hugin/ImagesPanel.cpp:749
2511
+#: hugin1/hugin/ImagesPanel.cpp:740
2512
 msgid "Positions and Translation (y,p,r,x,y,z)"
2513
 msgstr "Позиции и перенос (y,p,r,x,y,z)"
2514
 
2515
-#: hugin1/hugin/ImagesPanel.cpp:752
2516
+#: hugin1/hugin/ImagesPanel.cpp:743
2517
 msgid "Positions, Translation and View (y,p,r,x,y,z,v)"
2518
 msgstr "Позиции, перенос и вид (y,p,r,x,y,z,v)"
2519
 
2520
-#: hugin1/hugin/ImagesPanel.cpp:755
2521
+#: hugin1/hugin/ImagesPanel.cpp:746
2522
 msgid "Positions, Translation and Barrel (y,p,r,x,y,z,b)"
2523
 msgstr "Позиции, перенос и «бочку» (y,p,r,x,y,z,b)"
2524
 
2525
-#: hugin1/hugin/ImagesPanel.cpp:758
2526
+#: hugin1/hugin/ImagesPanel.cpp:749
2527
 msgid "Positions, Translation, View and Barrel (y,p,r,x,y,z,v,b)"
2528
 msgstr "Позиции, перенос, вид и «бочку» (y,p,r,x,y,z,v,b)"
2529
 
2530
-#: hugin1/hugin/ImagesPanel.cpp:762 hugin1/hugin/ImagesPanel.cpp:783
2531
+#: hugin1/hugin/ImagesPanel.cpp:753 hugin1/hugin/ImagesPanel.cpp:774
2532
 msgid "Custom parameters"
2533
 msgstr "Параметры, заданные вручную"
2534
 
2535
-#: hugin1/hugin/ImagesPanel.cpp:768
2536
+#: hugin1/hugin/ImagesPanel.cpp:759
2537
 msgid "Low dynamic range"
2538
 msgstr "Узкий динамический диапазон"
2539
 
2540
-#: hugin1/hugin/ImagesPanel.cpp:771
2541
+#: hugin1/hugin/ImagesPanel.cpp:762
2542
 msgid "Low dynamic range, variable white balance"
2543
 msgstr "Узкий динамический диапазон, переменный баланс белого"
2544
 
2545
-#: hugin1/hugin/ImagesPanel.cpp:776
2546
+#: hugin1/hugin/ImagesPanel.cpp:767
2547
 msgid "High dynamic range, fixed exposure"
2548
 msgstr "Широкий динамический диапазон, переменный баланс белого"
2549
 
2550
-#: hugin1/hugin/ImagesPanel.cpp:779
2551
+#: hugin1/hugin/ImagesPanel.cpp:770
2552
 msgid "High dynamic range, variable white balance, fixed exposure"
2553
 msgstr ""
2554
 "Широкий динамический диапазон, переменный баланс белого, фиксированная "
2555
 "экспозиция"
2556
 
2557
-#: hugin1/hugin/ImagesPanel.cpp:846
2558
+#: hugin1/hugin/ImagesPanel.cpp:837
2559
 msgid "Simple interface"
2560
 msgstr "Простой интерфейс"
2561
 
2562
-#: hugin1/hugin/ImagesPanel.cpp:849
2563
+#: hugin1/hugin/ImagesPanel.cpp:840
2564
 msgid "Advanced interface"
2565
 msgstr "Продвинутый интерфейс"
2566
 
2567
-#: hugin1/hugin/ImagesPanel.cpp:852
2568
+#: hugin1/hugin/ImagesPanel.cpp:843
2569
 msgid "Expert interface"
2570
 msgstr "Интерфейс для экспертов"
2571
 
2572
-#: hugin1/hugin/ImagesTree.cpp:139
2573
+#: hugin1/hugin/ImagesTree.cpp:142
2574
 msgid "Image number"
2575
 msgstr "Номер снимка"
2576
 
2577
-#: hugin1/hugin/ImagesTree.cpp:141
2578
+#: hugin1/hugin/ImagesTree.cpp:144
2579
 msgid "Width"
2580
 msgstr "Ширина"
2581
 
2582
-#: hugin1/hugin/ImagesTree.cpp:141
2583
+#: hugin1/hugin/ImagesTree.cpp:144
2584
 msgid "Image width"
2585
 msgstr "Ширина снимка"
2586
 
2587
-#: hugin1/hugin/ImagesTree.cpp:142
2588
+#: hugin1/hugin/ImagesTree.cpp:145
2589
 msgid "Height"
2590
 msgstr "Высота"
2591
 
2592
-#: hugin1/hugin/ImagesTree.cpp:142
2593
+#: hugin1/hugin/ImagesTree.cpp:145
2594
 msgid "Image height"
2595
 msgstr "Высота снимка"
2596
 
2597
-#: hugin1/hugin/ImagesTree.cpp:143
2598
+#: hugin1/hugin/ImagesTree.cpp:146
2599
 msgid "Anchor"
2600
 msgstr "Фиксация"
2601
 
2602
-#: hugin1/hugin/ImagesTree.cpp:143
2603
+#: hugin1/hugin/ImagesTree.cpp:146
2604
 msgid "Anchor image for position and/or exposure"
2605
 msgstr "Зафиксировать для снимка положение и/или экспозицию"
2606
 
2607
-#: hugin1/hugin/ImagesTree.cpp:144
2608
+#: hugin1/hugin/ImagesTree.cpp:147
2609
 msgid "# Ctrl Pnts"
2610
 msgstr "Кол.КТ"
2611
 
2612
-#: hugin1/hugin/ImagesTree.cpp:144
2613
+#: hugin1/hugin/ImagesTree.cpp:147
2614
 msgid "Number of control points in this image"
2615
 msgstr "Число контрольных точек в этом снимке"
2616
 
2617
-#: hugin1/hugin/ImagesTree.cpp:145
2618
+#: hugin1/hugin/ImagesTree.cpp:148
2619
 msgid "Lens no."
2620
 msgstr "№ объектива"
2621
 
2622
-#: hugin1/hugin/ImagesTree.cpp:145
2623
+#: hugin1/hugin/ImagesTree.cpp:148
2624
 msgid "Assigned lens number"
2625
 msgstr "Присвоенный номер объектива"
2626
 
2627
-#: hugin1/hugin/ImagesTree.cpp:146
2628
+#: hugin1/hugin/ImagesTree.cpp:149
2629
 msgid "Stack no."
2630
 msgstr "Номер стопки"
2631
 
2632
-#: hugin1/hugin/ImagesTree.cpp:146
2633
+#: hugin1/hugin/ImagesTree.cpp:149
2634
 msgid "Assigned stack number"
2635
 msgstr "Присвоенный номер стопки"
2636
 
2637
-#: hugin1/hugin/ImagesTree.cpp:148
2638
+#: hugin1/hugin/ImagesTree.cpp:151
2639
 msgid "Maker"
2640
 msgstr "Производитель"
2641
 
2642
-#: hugin1/hugin/ImagesTree.cpp:149
2643
+#: hugin1/hugin/ImagesTree.cpp:152
2644
 msgid "Model"
2645
 msgstr "Модель"
2646
 
2647
-#: hugin1/hugin/ImagesTree.cpp:150
2648
+#: hugin1/hugin/ImagesTree.cpp:153
2649
 msgid "Used lens"
2650
 msgstr "Использованный объектив"
2651
 
2652
-#: hugin1/hugin/ImagesTree.cpp:151
2653
+#: hugin1/hugin/ImagesTree.cpp:154
2654
 msgid "Capture date"
2655
 msgstr "Время и дата съёмки"
2656
 
2657
-#: hugin1/hugin/ImagesTree.cpp:151
2658
+#: hugin1/hugin/ImagesTree.cpp:154
2659
 msgid "Date, image was taken"
2660
 msgstr "Дата, когда снимок сделан"
2661
 
2662
-#: hugin1/hugin/ImagesTree.cpp:152
2663
+#: hugin1/hugin/ImagesTree.cpp:155
2664
 msgid "Focal length"
2665
 msgstr "Фокусное расстояние"
2666
 
2667
-#: hugin1/hugin/ImagesTree.cpp:153
2668
+#: hugin1/hugin/ImagesTree.cpp:156
2669
 msgid "Aperture"
2670
 msgstr "Апертура"
2671
 
2672
-#: hugin1/hugin/ImagesTree.cpp:154
2673
+#: hugin1/hugin/ImagesTree.cpp:157
2674
 msgid "Shutter Speed"
2675
 msgstr "Выдержка"
2676
 
2677
-#: hugin1/hugin/ImagesTree.cpp:154
2678
+#: hugin1/hugin/ImagesTree.cpp:157
2679
 msgid "Shutter speed"
2680
 msgstr "Выдержка"
2681
 
2682
-#: hugin1/hugin/ImagesTree.cpp:155
2683
+#: hugin1/hugin/ImagesTree.cpp:158
2684
 msgid "ISO"
2685
 msgstr "ISO"
2686
 
2687
-#: hugin1/hugin/ImagesTree.cpp:155
2688
+#: hugin1/hugin/ImagesTree.cpp:158
2689
 msgid "ISO speed"
2690
 msgstr "Значение ISO"
2691
 
2692
-#: hugin1/hugin/ImagesTree.cpp:157
2693
+#: hugin1/hugin/ImagesTree.cpp:160
2694
 msgid "Yaw (y)"
2695
 msgstr "Вокруг вертикали (y)"
2696
 
2697
-#: hugin1/hugin/ImagesTree.cpp:157
2698
+#: hugin1/hugin/ImagesTree.cpp:160
2699
 msgid "Yaw"
2700
 msgstr "Вокруг вертикали"
2701
 
2702
-#: hugin1/hugin/ImagesTree.cpp:158
2703
+#: hugin1/hugin/ImagesTree.cpp:161
2704
 msgid "Pitch (p)"
2705
 msgstr "Наклон горизонта (p)"
2706
 
2707
-#: hugin1/hugin/ImagesTree.cpp:158
2708
+#: hugin1/hugin/ImagesTree.cpp:161
2709
 msgid "Pitch"
2710
 msgstr "Наклон горизонта"
2711
 
2712
-#: hugin1/hugin/ImagesTree.cpp:159
2713
+#: hugin1/hugin/ImagesTree.cpp:162
2714
 msgid "Roll (r)"
2715
 msgstr "Вокруг оптической оси (r)"
2716
 
2717
-#: hugin1/hugin/ImagesTree.cpp:159
2718
+#: hugin1/hugin/ImagesTree.cpp:162
2719
 msgid "Roll"
2720
 msgstr "Вокруг оптической оси"
2721
 
2722
-#: hugin1/hugin/ImagesTree.cpp:160
2723
+#: hugin1/hugin/ImagesTree.cpp:163
2724
 msgid "Camera translation X"
2725
 msgstr "Перенос камеры по X"
2726
 
2727
-#: hugin1/hugin/ImagesTree.cpp:161
2728
+#: hugin1/hugin/ImagesTree.cpp:164
2729
 msgid "Camera translation Y"
2730
 msgstr "Перенос камеры по Y"
2731
 
2732
-#: hugin1/hugin/ImagesTree.cpp:162
2733
+#: hugin1/hugin/ImagesTree.cpp:165
2734
 msgid "Camera translation Z"
2735
 msgstr "Перенос камеры по Z"
2736
 
2737
-#: hugin1/hugin/ImagesTree.cpp:163
2738
+#: hugin1/hugin/ImagesTree.cpp:166
2739
 msgid "Plane yaw"
2740
 msgstr ""
2741
 
2742
-#: hugin1/hugin/ImagesTree.cpp:163
2743
+#: hugin1/hugin/ImagesTree.cpp:166
2744
 #, fuzzy
2745
 msgid "Translation remap plane yaw"
2746
 msgstr "Параметр переноса"
2747
 
2748
-#: hugin1/hugin/ImagesTree.cpp:164
2749
+#: hugin1/hugin/ImagesTree.cpp:167
2750
 #, fuzzy
2751
 msgid "Plane pitch"
2752
 msgstr "Наклон горизонта"
2753
 
2754
-#: hugin1/hugin/ImagesTree.cpp:164
2755
+#: hugin1/hugin/ImagesTree.cpp:167
2756
 #, fuzzy
2757
 msgid "Translation remap plane pitch"
2758
 msgstr "Параметр переноса"
2759
 
2760
-#: hugin1/hugin/ImagesTree.cpp:165
2761
+#: hugin1/hugin/ImagesTree.cpp:168
2762
 #, fuzzy
2763
 msgid "Camera translation"
2764
 msgstr "Перенос камеры по X"
2765
 
2766
-#: hugin1/hugin/ImagesTree.cpp:167
2767
+#: hugin1/hugin/ImagesTree.cpp:170
2768
 msgid "Lens type (f)"
2769
 msgstr "Тип объектива (f)"
2770
 
2771
-#: hugin1/hugin/ImagesTree.cpp:167
2772
+#: hugin1/hugin/ImagesTree.cpp:170
2773
 msgid "Lens type (rectilinear, fisheye, equirectangular, ...)"
2774
 msgstr "Тип объектива (прямолинейный, РыбийГлаз, эквидистантный, ...)"
2775
 
2776
-#: hugin1/hugin/ImagesTree.cpp:168
2777
+#: hugin1/hugin/ImagesTree.cpp:171
2778
 msgid "Hfov (v)"
2779
 msgstr "ГорПЗ (v)"
2780
 
2781
-#: hugin1/hugin/ImagesTree.cpp:168
2782
+#: hugin1/hugin/ImagesTree.cpp:171
2783
 msgid "Horizontal field of view (v)"
2784
 msgstr "Горизонтальный угол обзора (v)"
2785
 
2786
-#: hugin1/hugin/ImagesTree.cpp:169
2787
+#: hugin1/hugin/ImagesTree.cpp:172
2788
 msgid "Radial distortion (a)"
2789
 msgstr "Радиальное искажение (a)"
2790
 
2791
-#: hugin1/hugin/ImagesTree.cpp:170
2792
+#: hugin1/hugin/ImagesTree.cpp:173
2793
 msgid "Radial distortion (b, barrel)"
2794
 msgstr "Радиальное искажение (b, бочка)"
2795
 
2796
-#: hugin1/hugin/ImagesTree.cpp:171
2797
+#: hugin1/hugin/ImagesTree.cpp:174
2798
 msgid "Radial distortion (c)"
2799
 msgstr "Радиальное искажение (c)"
2800
 
2801
-#: hugin1/hugin/ImagesTree.cpp:172
2802
+#: hugin1/hugin/ImagesTree.cpp:175
2803
 msgid "Horizontal image center shift (d)"
2804
 msgstr "Горизонтальное смещение центра снимка (d)"
2805
 
2806
-#: hugin1/hugin/ImagesTree.cpp:173
2807
+#: hugin1/hugin/ImagesTree.cpp:176
2808
 msgid "Vertical image center shift (e)"
2809
 msgstr "Вертикальное смещение центра снимка (e)"
2810
 
2811
-#: hugin1/hugin/ImagesTree.cpp:174
2812
+#: hugin1/hugin/ImagesTree.cpp:177
2813
 msgid "Horizontal image shearing (g)"
2814
 msgstr "Горизонтальный скос снимка (g)"
2815
 
2816
-#: hugin1/hugin/ImagesTree.cpp:175
2817
+#: hugin1/hugin/ImagesTree.cpp:178
2818
 msgid "Vertical image shearing (t)"
2819
 msgstr "Вертикальный скос снимка (t)"
2820
 
2821
-#: hugin1/hugin/ImagesTree.cpp:177
2822
+#: hugin1/hugin/ImagesTree.cpp:180
2823
 msgid "Exposure value (Eev)"
2824
 msgstr "Экспозиция (Eev)"
2825
 
2826
-#: hugin1/hugin/ImagesTree.cpp:178
2827
+#: hugin1/hugin/ImagesTree.cpp:181
2828
 msgid "Red multiplier (Er)"
2829
 msgstr "Множитель красного (Er)"
2830
 
2831
-#: hugin1/hugin/ImagesTree.cpp:179
2832
+#: hugin1/hugin/ImagesTree.cpp:182
2833
 msgid "Blue multiplier (Eb)"
2834
 msgstr "Множитель синего (Eb)"
2835
 
2836
-#: hugin1/hugin/ImagesTree.cpp:180 hugin1/hugin/ImagesTree.cpp:181
2837
-#: hugin1/hugin/ImagesTree.cpp:182
2838
+#: hugin1/hugin/ImagesTree.cpp:183 hugin1/hugin/ImagesTree.cpp:184
2839
+#: hugin1/hugin/ImagesTree.cpp:185
2840
 msgid "Vignetting (Vb, Vc, Vd)"
2841
 msgstr "Виньетирование (Vb, Vc, Vd)"
2842
 
2843
-#: hugin1/hugin/ImagesTree.cpp:183
2844
+#: hugin1/hugin/ImagesTree.cpp:186
2845
 msgid "Horizontal vignetting center shift (Vx)"
2846
 msgstr "Смещение центра виньетирования по горизонтали (Vx)"
2847
 
2848
-#: hugin1/hugin/ImagesTree.cpp:184
2849
+#: hugin1/hugin/ImagesTree.cpp:187
2850
 msgid "Vertical vignetting center shift (Vy)"
2851
 msgstr "Смещение центра виньетирования по вертикали (Vy)"
2852
 
2853
-#: hugin1/hugin/ImagesTree.cpp:185
2854
+#: hugin1/hugin/ImagesTree.cpp:188
2855
 msgid "Response type"
2856
 msgstr "Тип отклика"
2857
 
2858
-#: hugin1/hugin/ImagesTree.cpp:185
2859
+#: hugin1/hugin/ImagesTree.cpp:188
2860
 msgid "Camera response type"
2861
 msgstr "Тип отклика камеры"
2862
 
2863
-#: hugin1/hugin/ImagesTree.cpp:186 hugin1/hugin/ImagesTree.cpp:187
2864
-#: hugin1/hugin/ImagesTree.cpp:188 hugin1/hugin/ImagesTree.cpp:189
2865
-#: hugin1/hugin/ImagesTree.cpp:190
2866
+#: hugin1/hugin/ImagesTree.cpp:189 hugin1/hugin/ImagesTree.cpp:190
2867
+#: hugin1/hugin/ImagesTree.cpp:191 hugin1/hugin/ImagesTree.cpp:192
2868
+#: hugin1/hugin/ImagesTree.cpp:193
2869
 msgid "Camera response parameter"
2870
 msgstr "Параметр отклика камеры"
2871
 
2872
-#: hugin1/hugin/ImagesTree.cpp:495 hugin1/hugin/ImagesTree.cpp:677
2873
+#: hugin1/hugin/ImagesTree.cpp:491 hugin1/hugin/ImagesTree.cpp:666
2874
 msgid "not active"
2875
 msgstr ""
2876
 
2877
-#: hugin1/hugin/ImagesTree.cpp:498 hugin1/hugin/ImagesTree.cpp:680
2878
+#: hugin1/hugin/ImagesTree.cpp:494 hugin1/hugin/ImagesTree.cpp:669
2879
 msgid "active"
2880
 msgstr ""
2881
 
2882
-#: hugin1/hugin/ImagesTree.cpp:640
2883
+#: hugin1/hugin/ImagesTree.cpp:636
2884
 #, fuzzy, c-format
2885
 msgid "Lens %ld"
2886
 msgstr "Объектив %d"
2887
 
2888
-#: hugin1/hugin/ImagesTree.cpp:643
2889
+#: hugin1/hugin/ImagesTree.cpp:639
2890
 #, fuzzy, c-format
2891
 msgid "Stack %ld"
2892
 msgstr "Стопка %d"
2893
 
2894
-#: hugin1/hugin/ImagesTree.cpp:646
2895
+#: hugin1/hugin/ImagesTree.cpp:642
2896
 #, fuzzy, c-format
2897
 msgid "Output stack %ld"
2898
 msgstr "Выходная стопка %d"
2899
 
2900
-#: hugin1/hugin/ImagesTree.cpp:649
2901
+#: hugin1/hugin/ImagesTree.cpp:645
2902
 #, fuzzy, c-format
2903
 msgid "Output exposure layer %ld"
2904
 msgstr "Слой совмещенных экспозиций %d"
2905
 
2906
-#: hugin1/hugin/ImagesTree.cpp:1110 hugin1/hugin/ImagesTree.cpp:1125
2907
+#: hugin1/hugin/ImagesTree.cpp:1099 hugin1/hugin/ImagesTree.cpp:1114
2908
 msgid "Link"
2909
 msgstr "Связать"
2910
 
2911
-#: hugin1/hugin/ImagesTree.cpp:1114 hugin1/hugin/ImagesTree.cpp:1121
2912
+#: hugin1/hugin/ImagesTree.cpp:1103 hugin1/hugin/ImagesTree.cpp:1110
2913
 msgid "Unlink"
2914
 msgstr "Убрать связь"
2915
 
2916
-#: hugin1/hugin/ImagesTree.cpp:1136
2917
+#: hugin1/hugin/ImagesTree.cpp:1125
2918
 msgid "Select all for current lens"
2919
 msgstr "Выделить все для текущего объектива"
2920
 
2921
-#: hugin1/hugin/ImagesTree.cpp:1137
2922
+#: hugin1/hugin/ImagesTree.cpp:1126
2923
 msgid "Unselect all for current lens"
2924
 msgstr "Сбросить все для текущего объектива"
2925
 
2926
-#: hugin1/hugin/ImagesTree.cpp:1141
2927
+#: hugin1/hugin/ImagesTree.cpp:1130
2928
 msgid "Select all for current stack"
2929
 msgstr "Выделить все для текущей стопки"
2930
 
2931
-#: hugin1/hugin/ImagesTree.cpp:1142
2932
+#: hugin1/hugin/ImagesTree.cpp:1131
2933
 msgid "Unselect all for current stack"
2934
 msgstr "Сбросить выделение для текущей стопки"
2935
 
2936
-#: hugin1/hugin/ImagesTree.cpp:1147 hugin1/hugin/ImagesTree.cpp:1161
2937
-#: hugin1/hugin/ImagesTree.cpp:1247
2938
+#: hugin1/hugin/ImagesTree.cpp:1136 hugin1/hugin/ImagesTree.cpp:1150
2939
+#: hugin1/hugin/ImagesTree.cpp:1236
2940
 msgid "Select all"
2941
 msgstr "Выделить все"
2942
 
2943
-#: hugin1/hugin/ImagesTree.cpp:1149 hugin1/hugin/ImagesTree.cpp:1163
2944
-#: hugin1/hugin/ImagesTree.cpp:1248
2945
+#: hugin1/hugin/ImagesTree.cpp:1138 hugin1/hugin/ImagesTree.cpp:1152
2946
+#: hugin1/hugin/ImagesTree.cpp:1237
2947
 msgid "Unselect all"
2948
 msgstr "Сбросить все"
2949
 
2950
-#: hugin1/hugin/ImagesTree.cpp:1153
2951
+#: hugin1/hugin/ImagesTree.cpp:1142
2952
 msgid "Edit image variables..."
2953
 msgstr "Редактировать переменные снимка..."
2954
 
2955
-#: hugin1/hugin/ImagesTree.cpp:1203
2956
+#: hugin1/hugin/ImagesTree.cpp:1192
2957
 msgid "Control points"
2958
 msgstr "Контрольные точки"
2959
 
2960
-#: hugin1/hugin/ImagesTree.cpp:1213 hugin1/hugin/xrc/lenscal_frame.xrc:213
2961
-#: hugin1/hugin/xrc/mask_editor_panel.xrc:333
2962
-#: hugin1/hugin/xrc/optimize_panel.xrc:60
2963
-#: hugin1/hugin/xrc/optimize_photo_panel.xrc:60
2964
-#: hugin1/hugin/xrc/reset_dialog.xrc:8
2965
+#: hugin1/hugin/ImagesTree.cpp:1202 translations/xrc.cpp:278
2966
+#: translations/xrc.cpp:502 translations/xrc.cpp:524 translations/xrc.cpp:534
2967
+#: translations/xrc.cpp:1085
2968
 msgid "Reset"
2969
 msgstr "Сбросить"
2970
 
2971
@@ -2479,8 +2364,7 @@
2972
 msgid "Tip of the Day"
2973
 msgstr "Совет дня"
2974
 
2975
-#: hugin1/hugin/LocalizedFileTipProvider.cpp:111
2976
-#: hugin1/hugin/xrc/batch_frame.xrc:534
2977
+#: hugin1/hugin/LocalizedFileTipProvider.cpp:111 translations/xrc.cpp:63
2978
 msgid "&Close"
2979
 msgstr "&Закрыть"
2980
 
2981
@@ -2488,12 +2372,12 @@
2982
 msgid "Did you know..."
2983
 msgstr "Знаете ли вы, что..."
2984
 
2985
-#: hugin1/hugin/MainFrame.cpp:329
2986
+#: hugin1/hugin/MainFrame.cpp:328
2987
 #, c-format
2988
 msgid "Version %s"
2989
 msgstr "Версия %s"
2990
 
2991
-#: hugin1/hugin/MainFrame.cpp:338
2992
+#: hugin1/hugin/MainFrame.cpp:336
2993
 msgid ""
2994
 "Fatal installation error\n"
2995
 "The file data/splash.png was not found at:"
2996
@@ -2501,76 +2385,74 @@
2997
 "Фатальная ошибка при установке\n"
2998
 "Файл data/splash.png не был найден по адресу:"
2999
 
3000
-#: hugin1/hugin/MainFrame.cpp:358 hugin1/ptbatcher/BatchFrame.cpp:145
3001
-#: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:136
3002
-#: hugin1/hugin/xrc/main_menu.xrc:138 hugin1/hugin/xrc/preview_frame.xrc:1895
3003
-#: hugin1/hugin/xrc/preview_frame.xrc:1924
3004
+#: hugin1/hugin/MainFrame.cpp:356 hugin1/ptbatcher/BatchFrame.cpp:144
3005
+#: translations/xrc.cpp:86 translations/xrc.cpp:394 translations/xrc.cpp:395
3006
+#: translations/xrc.cpp:1055 translations/xrc.cpp:1068
3007
 msgid "&Help"
3008
 msgstr "&Справка"
3009
 
3010
-#: hugin1/hugin/MainFrame.cpp:414
3011
+#: hugin1/hugin/MainFrame.cpp:411
3012
 msgid "&Actions"
3013
 msgstr "&Действия"
3014
 
3015
-#: hugin1/hugin/MainFrame.cpp:506
3016
+#: hugin1/hugin/MainFrame.cpp:503
3017
 msgid "Started"
3018
 msgstr "К работе готов"
3019
 
3020
-#: hugin1/hugin/MainFrame.cpp:639 hugin1/hugin/xrc/main_frame.xrc:34
3021
-#: hugin1/hugin/xrc/main_menu.xrc:92
3022
+#: hugin1/hugin/MainFrame.cpp:635 translations/xrc.cpp:328
3023
+#: translations/xrc.cpp:384
3024
 msgid "Optimizer"
3025
 msgstr "Оптимизация"
3026
 
3027
-#: hugin1/hugin/MainFrame.cpp:651 hugin1/hugin/MainFrame.cpp:655
3028
-#: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/main_menu.xrc:97
3029
-#: hugin1/hugin/xrc/reset_dialog.xrc:46
3030
+#: hugin1/hugin/MainFrame.cpp:647 hugin1/hugin/MainFrame.cpp:651
3031
+#: translations/xrc.cpp:329 translations/xrc.cpp:386 translations/xrc.cpp:1090
3032
 msgid "Exposure"
3033
 msgstr "Экспозиция"
3034
 
3035
-#: hugin1/hugin/MainFrame.cpp:698
3036
+#: hugin1/hugin/MainFrame.cpp:694
3037
 msgid "Save changes to the panorama before closing?"
3038
 msgstr "Сохранить изменения в проекте перед закрытием?"
3039
 
3040
-#: hugin1/hugin/MainFrame.cpp:706
3041
+#: hugin1/hugin/MainFrame.cpp:702
3042
 msgid ""
3043
 "If you close without saving, changes since your last save will be discarded"
3044
 msgstr ""
3045
 "Если вы выйдите без сохранения, изменения с момента последнего сохранения "
3046
 "будут потеряны"
3047
 
3048
-#: hugin1/hugin/MainFrame.cpp:709
3049
+#: hugin1/hugin/MainFrame.cpp:705
3050
 msgid "Don't Save"
3051
 msgstr "Не сохранять"
3052
 
3053
-#: hugin1/hugin/MainFrame.cpp:712
3054
+#: hugin1/hugin/MainFrame.cpp:708
3055
 msgid "Close without saving"
3056
 msgstr "Закрыть без сохранения"
3057
 
3058
-#: hugin1/hugin/MainFrame.cpp:744
3059
+#: hugin1/hugin/MainFrame.cpp:740
3060
 msgid "forced close"
3061
 msgstr "принудительно закрыто"
3062
 
3063
-#: hugin1/hugin/MainFrame.cpp:788
3064
+#: hugin1/hugin/MainFrame.cpp:786
3065
 #, c-format
3066
 msgid "saved project %s"
3067
 msgstr "сохранён проект %s"
3068
 
3069
-#: hugin1/hugin/MainFrame.cpp:793 hugin1/hugin/MainFrame.cpp:799
3070
-#: hugin1/hugin/MainFrame.cpp:910 hugin1/hugin/MainFrame.cpp:916
3071
-#: hugin1/hugin/MainFrame.cpp:1012 hugin1/hugin/MainFrame.cpp:1018
3072
-#: hugin1/hugin/MainFrame.cpp:2022 hugin1/hugin/MainFrame.cpp:2028
3073
-#: hugin1/hugin/MainFrame.cpp:2040 hugin1/hugin/MainFrame.cpp:2045
3074
-#: hugin1/hugin/xrc/main_frame.xrc:4
3075
+#: hugin1/hugin/MainFrame.cpp:791 hugin1/hugin/MainFrame.cpp:797
3076
+#: hugin1/hugin/MainFrame.cpp:908 hugin1/hugin/MainFrame.cpp:914
3077
+#: hugin1/hugin/MainFrame.cpp:1010 hugin1/hugin/MainFrame.cpp:1016
3078
+#: hugin1/hugin/MainFrame.cpp:1941 hugin1/hugin/MainFrame.cpp:1947
3079
+#: hugin1/hugin/MainFrame.cpp:1959 hugin1/hugin/MainFrame.cpp:1964
3080
+#: translations/xrc.cpp:324
3081
 msgid "Hugin - Panorama Stitcher"
3082
 msgstr "Hugin - сборщик панорам "
3083
 
3084
-#: hugin1/hugin/MainFrame.cpp:795 hugin1/hugin/MainFrame.cpp:912
3085
-#: hugin1/hugin/MainFrame.cpp:1014 hugin1/hugin/MainFrame.cpp:2023
3086
-#: hugin1/hugin/MainFrame.cpp:2029
3087
+#: hugin1/hugin/MainFrame.cpp:793 hugin1/hugin/MainFrame.cpp:910
3088
+#: hugin1/hugin/MainFrame.cpp:1012 hugin1/hugin/MainFrame.cpp:1942
3089
+#: hugin1/hugin/MainFrame.cpp:1948
3090
 msgid "Panorama editor"
3091
 msgstr "Редактор панорам"
3092
 
3093
-#: hugin1/hugin/MainFrame.cpp:806
3094
+#: hugin1/hugin/MainFrame.cpp:804
3095
 #, c-format
3096
 msgid ""
3097
 "Could not save project file \"%s\".\n"
3098
@@ -2583,31 +2465,31 @@
3099
 "\n"
3100
 "(Код ошибки: %s)"
3101
 
3102
-#: hugin1/hugin/MainFrame.cpp:858
3103
+#: hugin1/hugin/MainFrame.cpp:856
3104
 msgid "Save PTmender script file"
3105
 msgstr "Сохранить файл сценария PTmender"
3106
 
3107
-#: hugin1/hugin/MainFrame.cpp:860
3108
+#: hugin1/hugin/MainFrame.cpp:858
3109
 msgid "PTmender files (*.txt)|*.txt"
3110
 msgstr "Файлы PTmender (*.txt)|*.txt"
3111
 
3112
-#: hugin1/hugin/MainFrame.cpp:886
3113
+#: hugin1/hugin/MainFrame.cpp:884
3114
 msgid "Open project:   "
3115
 msgstr "Открыть проект:   "
3116
 
3117
-#: hugin1/hugin/MainFrame.cpp:904
3118
+#: hugin1/hugin/MainFrame.cpp:902
3119
 msgid "Project opened"
3120
 msgstr "Проект открыт"
3121
 
3122
-#: hugin1/hugin/MainFrame.cpp:928
3123
+#: hugin1/hugin/MainFrame.cpp:926
3124
 msgid "Error opening project:   "
3125
 msgstr "Ошибка при открытии проекта:   "
3126
 
3127
-#: hugin1/hugin/MainFrame.cpp:960 hugin1/hugin/MainFrame.cpp:1445
3128
+#: hugin1/hugin/MainFrame.cpp:958 hugin1/hugin/MainFrame.cpp:1398
3129
 msgid "Open project file"
3130
 msgstr "Открыть проектный файл"
3131
 
3132
-#: hugin1/hugin/MainFrame.cpp:970
3133
+#: hugin1/hugin/MainFrame.cpp:968
3134
 #, c-format
3135
 msgid ""
3136
 "File %s is an image file and not a project file.\n"
3137
@@ -2618,42 +2500,32 @@
3138
 "Этот файл нельзя открыть с помощью меню Файл, Открыть.\n"
3139
 "Добавить этот снимок в текущий проект?"
3140
 
3141
-#: hugin1/hugin/MainFrame.cpp:996
3142
+#: hugin1/hugin/MainFrame.cpp:994
3143
 msgid "Open project: cancel"
3144
 msgstr "Открыть проект: отмена"
3145
 
3146
-#: hugin1/hugin/MainFrame.cpp:1259
3147
+#: hugin1/hugin/MainFrame.cpp:1242
3148
 msgid "Can't start system's web browser"
3149
 msgstr "Не удалось запустить системный веб-браузер"
3150
 
3151
-#: hugin1/hugin/MainFrame.cpp:1478
3152
+#: hugin1/hugin/MainFrame.cpp:1431
3153
 #, c-format
3154
 msgid "Could not read project file %s."
3155
 msgstr "Не удалось прочитать проектный файл %s."
3156
 
3157
-#: hugin1/hugin/MainFrame.cpp:1487
3158
-#, fuzzy
3159
-msgid "Open Papywizard xml file"
3160
-msgstr "Открыть файл проекта"
3161
-
3162
-#: hugin1/hugin/MainFrame.cpp:1488
3163
-#, fuzzy
3164
-msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*"
3165
-msgstr "Файлы масок (*.msk)|*.msk|Все файлы (*)|*"
3166
-
3167
-#: hugin1/hugin/MainFrame.cpp:1504
3168
+#: hugin1/hugin/MainFrame.cpp:1443
3169
 msgid "Choose template project"
3170
 msgstr "Выберите шаблон проекта"
3171
 
3172
-#: hugin1/hugin/MainFrame.cpp:1580
3173
+#: hugin1/hugin/MainFrame.cpp:1519
3174
 msgid "Fine-tuning all points"
3175
 msgstr "Точная коррекция всех точек"
3176
 
3177
-#: hugin1/hugin/MainFrame.cpp:1580
3178
+#: hugin1/hugin/MainFrame.cpp:1519
3179
 msgid "Fine-tuning"
3180
 msgstr "Точная коррекция"
3181
 
3182
-#: hugin1/hugin/MainFrame.cpp:1651
3183
+#: hugin1/hugin/MainFrame.cpp:1590
3184
 #, c-format
3185
 msgid ""
3186
 "%d points fine-tuned, %d points not updated due to low correlation\n"
3187
@@ -2682,23 +2554,29 @@
3188
 "Используйте Список контрольных точек (F3) для просмотра всех точек текущего "
3189
 "проекта.\n"
3190
 
3191
-#: hugin1/hugin/MainFrame.cpp:1653
3192
+#: hugin1/hugin/MainFrame.cpp:1592
3193
 msgid "Fine-tune result"
3194
 msgstr "Результат точной коррекции"
3195
 
3196
-#: hugin1/hugin/MainFrame.cpp:1671
3197
+#: hugin1/hugin/MainFrame.cpp:1609 hugin1/hugin/PanoOperation.cpp:707
3198
+#: hugin1/hugin/PanoOperation.cpp:795
3199
+#, c-format
3200
+msgid "Removed %lu control points"
3201
+msgstr "Удалено %lu контрольных точек"
3202
+
3203
+#: hugin1/hugin/MainFrame.cpp:1610
3204
 msgid "Removing control points in masks"
3205
 msgstr "Удаление контрольных точек под масками"
3206
 
3207
-#: hugin1/hugin/MainFrame.cpp:1680
3208
+#: hugin1/hugin/MainFrame.cpp:1619
3209
 msgid "Select python script"
3210
 msgstr "Выберите сценарий python"
3211
 
3212
-#: hugin1/hugin/MainFrame.cpp:1682
3213
+#: hugin1/hugin/MainFrame.cpp:1621
3214
 msgid "Python script (*.py)|*.py|All files (*.*)|*.*"
3215
 msgstr "Сценарий Python (*.py)|*.py|Все файлы (*)|*"
3216
 
3217
-#: hugin1/hugin/MainFrame.cpp:1899
3218
+#: hugin1/hugin/MainFrame.cpp:1818
3219
 #, c-format
3220
 msgid ""
3221
 "File \"%s\" not found.\n"
3222
@@ -2707,13 +2585,13 @@
3223
 "Файл «%s» не найден.\n"
3224
 "Возможно он был переименован, перемещён  или удалён."
3225
 
3226
-#: hugin1/hugin/MainFrame.cpp:1900 hugin1/ptbatcher/Batch.cpp:353
3227
-#: hugin1/ptbatcher/Batch.cpp:807 hugin1/ptbatcher/Batch.cpp:823
3228
-#: hugin1/ptbatcher/Batch.cpp:986
3229
+#: hugin1/hugin/MainFrame.cpp:1819 hugin1/ptbatcher/Batch.cpp:333
3230
+#: hugin1/ptbatcher/Batch.cpp:779 hugin1/ptbatcher/Batch.cpp:795
3231
+#: hugin1/ptbatcher/Batch.cpp:955
3232
 msgid "Error!"
3233
 msgstr "Ошибка!"
3234
 
3235
-#: hugin1/hugin/MainFrame.cpp:1926
3236
+#: hugin1/hugin/MainFrame.cpp:1845
3237
 #, c-format
3238
 msgid ""
3239
 "Celeste model expected in %s not found, Hugin needs to be properly installed."
3240
@@ -2721,12 +2599,12 @@
3241
 "Модель Celeste искомый в %s не найдена, необходимо корректно установить "
3242
 "Hugin."
3243
 
3244
-#: hugin1/hugin/MainFrame.cpp:1931
3245
+#: hugin1/hugin/MainFrame.cpp:1850
3246
 #, c-format
3247
 msgid "Could not load Celeste model file %s"
3248
 msgstr "Не удалось загрузить файл модели Celeste %s"
3249
 
3250
-#: hugin1/hugin/MainFrame.cpp:2065
3251
+#: hugin1/hugin/MainFrame.cpp:1984
3252
 msgid ""
3253
 "Can't switch to simple interface. The project is using stacks and/or "
3254
 "vignetting center shift.\n"
3