diff options
| author | Julien Valroff <julien@kirya.net> | 2011-03-25 21:52:18 +0100 |
|---|---|---|
| committer | Julien Valroff <julien@kirya.net> | 2011-03-25 21:52:18 +0100 |
| commit | 92204205e559d12e5644ab41106f137dcff03e10 (patch) | |
| tree | 66e45179776a797c9313c8a568f8128a1412ee5a /rapid/glade3 | |
| parent | 8f87afa02084896e6d7a8833979e9b537616fbd9 (diff) | |
| parent | 2a910aa02d2e0c157572818520781e2e16889923 (diff) | |
Merge commit 'upstream/0.3.5'
Diffstat (limited to 'rapid/glade3')
| -rw-r--r-- | rapid/glade3/photo_small.png | bin | 0 -> 924 bytes | |||
| -rw-r--r-- | rapid/glade3/rapid.glade | 5 | ||||
| -rw-r--r-- | rapid/glade3/video_small.png | bin | 0 -> 1629 bytes |
3 files changed, 3 insertions, 2 deletions
diff --git a/rapid/glade3/photo_small.png b/rapid/glade3/photo_small.png Binary files differnew file mode 100644 index 0000000..f44d380 --- /dev/null +++ b/rapid/glade3/photo_small.png diff --git a/rapid/glade3/rapid.glade b/rapid/glade3/rapid.glade index 7975593..163174b 100644 --- a/rapid/glade3/rapid.glade +++ b/rapid/glade3/rapid.glade @@ -2827,7 +2827,7 @@ You can download photos from multiple devices simultaneously, or you can specify <property name="icon">rapid-photo-downloader.svg</property> <property name="type_hint">normal</property> <property name="program_name">Rapid Photo Downloader</property> - <property name="copyright" translatable="yes">Copyright Damon Lynch 2007-10</property> + <property name="copyright" translatable="yes">Copyright Damon Lynch 2007-11</property> <property name="comments" translatable="yes">Import your photos and videos 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. @@ -2840,6 +2840,7 @@ You should have received a copy of the GNU General Public License along with Rap Lőrincz András <level.andrasnak@gmail.com> Michel Ange <michelange@wanadoo.fr> Alain J. Baudrez <a.baudrez@gmail.com> +Bert <crinbert@yahoo.com> Martin Dahl Moe Martin Egger <martin.egger@gmx.net> Miroslav Matejaš <silverspace@ubuntu-hr.org> @@ -3112,8 +3113,8 @@ Aron Xu <happyaron.xu@gmail.com> <property name="use_underline">True</property> <property name="use_stock">True</property> <signal name="activate" handler="on_menu_zoom_in_activate"/> - <accelerator key="equal" signal="activate" modifiers="GDK_CONTROL_MASK"/> <accelerator key="plus" signal="activate" modifiers="GDK_CONTROL_MASK"/> + <accelerator key="equal" signal="activate" modifiers="GDK_CONTROL_MASK"/> </widget> </child> <child> diff --git a/rapid/glade3/video_small.png b/rapid/glade3/video_small.png Binary files differnew file mode 100644 index 0000000..74e7c0f --- /dev/null +++ b/rapid/glade3/video_small.png |
