diff options
| author | Julien Valroff <julien@kirya.net> | 2010-09-17 21:08:25 +0200 |
|---|---|---|
| committer | Julien Valroff <julien@kirya.net> | 2010-09-17 21:08:25 +0200 |
| commit | 385082408a0e2a83a64e9fb6f2d114b1a5663e52 (patch) | |
| tree | ee3c4444dee7e4cf920ec1012245680be311ca21 /rapid | |
| parent | c9f315011ed3a7d27c2d38194fc4f235df037674 (diff) | |
| parent | e653d7822032e1a963c9546357146e76c1a4dff8 (diff) | |
Merge commit 'upstream/0.3.2'
Diffstat (limited to 'rapid')
| -rw-r--r-- | rapid/ChangeLog | 16 | ||||
| -rw-r--r-- | rapid/config.py | 2 | ||||
| -rwxr-xr-x | rapid/rapid.py | 6 |
3 files changed, 18 insertions, 6 deletions
diff --git a/rapid/ChangeLog b/rapid/ChangeLog index 259029a..4ac5796 100644 --- a/rapid/ChangeLog +++ b/rapid/ChangeLog @@ -1,3 +1,15 @@ +Version 0.3.2 +------------- + +2010-09-12 + +Added Norwegian Nynorsk translation. Updated Chinese, Finnish, Hungarian, Dutch, +Occitan (post 1500), Polish, Brazilian Portuguese, and Russian translations. + +Fixed crash on startup when checking for freespace, and the download folder does +not exist. + + Version 0.3.1 ------------- @@ -14,8 +26,8 @@ higher). Add Chinese (simplified) translation. A big thanks goes out to the Ubuntu Chinese translation team. Partial translations of Bulgarian, Japanese, Occitan -(post 1500), Persian, Portugese (Brazilian), and Turkish have been added. In the -past only translations that were largely finished were added, but hopefully +(post 1500), Persian, Portuguese (Brazilian), and Turkish have been added. In +the past only translations that were largely finished were added, but hopefully adding incomplete translations will speed up their completion. Updated Finnish, French, Hungarian, Russian, Serbian and Spanish translations. diff --git a/rapid/config.py b/rapid/config.py index 6fe31b1..cb77ca6 100644 --- a/rapid/config.py +++ b/rapid/config.py @@ -15,7 +15,7 @@ ### along with this program; if not, write to the Free Software ### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -version = '0.3.1' +version = '0.3.2' GCONF_KEY="/apps/rapid-photo-downloader" GLADE_FILE = "glade3/rapid.glade" diff --git a/rapid/rapid.py b/rapid/rapid.py index 4a1c821..e2444fb 100755 --- a/rapid/rapid.py +++ b/rapid/rapid.py @@ -4880,13 +4880,13 @@ class RapidApp(gnomeglade.GnomeApp, dbus.service.Object): Displays the amount of space free on the filesystem the files will be downloaded to. Also displays backup volumes / path being used. """ - if using_gio: + msg = '' + if using_gio and os.path.isdir(self.prefs.download_folder): folder = gio.File(self.prefs.download_folder) fileInfo = folder.query_filesystem_info(gio.FILE_ATTRIBUTE_FILESYSTEM_FREE) free = common.formatSizeForUser(fileInfo.get_attribute_uint64(gio.FILE_ATTRIBUTE_FILESYSTEM_FREE)) msg = " " + _("%(free)s available") % {'free': free} - else: - msg = '' + if self.prefs.backup_images: if not self.prefs.backup_device_autodetection: |