Merge commit 'upstream/0.1.2'

1 files changed, 15 insertions, 1 deletions

diff --git a/rapid/glade3/rapid.glade b/rapid/glade3/rapid.glade
index 79ceee1..41387c7 100644
--- a/rapid/glade3/rapid.glade
+++ b/rapid/glade3/rapid.glade
@@ -774,6 +774,19 @@
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="synchronize_raw_jpg_checkbutton">
+                                    <property name="label" translatable="yes">Synchronize RAW + JPEG sequence numbers</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="on_synchronize_raw_jpg_checkbutton_toggled"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
                               </widget>
                               <packing>
                                 <property name="position">1</property>
@@ -2368,7 +2381,7 @@ You can download photos from multiple image devices simultaneously.
     <property name="icon">rapid-photo-downloader-about.png</property>
     <property name="type_hint">normal</property>
     <property name="program_name">Rapid Photo Downloader</property>
-    <property name="copyright" translatable="yes">Copyright Damon Lynch 2007-09</property>
+    <property name="copyright" translatable="yes">Copyright Damon Lynch 2007-10</property>
     <property name="comments" translatable="yes">Import your images efficiently and reliably</property>
     <property name="website">http://www.damonlynch.net/rapid</property>
     <property name="license" translatable="yes">Rapid Photo Downloader is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
@@ -2387,6 +2400,7 @@ Tomas Novak &lt;kuvaly@seznam.cz&gt;
 Abel O'Rian &lt;abel.orian@gmail.com&gt;
 Balazs Oveges &lt;ovegesb@freemail.hu&gt;
 Daniel Paessler &lt;daniel@paessler.org&gt;
+Milo&#x161; Popovi&#x107; &lt;gpopac@gmail.com&gt;
 Michal Predotka &lt;mpredotka@googlemail.com&gt;
 Luca Reverberi &lt;thereve@gmail.com&gt;
 Mikko Ruohola &lt;polarfox@polarfox.net&gt;