diff -Nru sbackup-0.11.4/AUTHORS sbackup-0.11.6/AUTHORS --- sbackup-0.11.4/AUTHORS 2011-02-13 18:22:21.000000000 +0100 +++ sbackup-0.11.6/AUTHORS 2013-09-17 20:50:03.000000000 +0200 @@ -3,12 +3,24 @@ Oumar Aziz Ouattara Former maintainers: -Aigars Mahinovs -Jonh Wendell +Aigars Mahinovs +Jonh Wendell Contributors: -Martin Schaaf +Martin Schaaf Florian Achleitner -Andreas Sliwka +Andreas Sliwka +Rogach (platon7pronko) +Felix Griewald (tiiunder) +Marc Deslauriers +Thibault Godouet +Anton Feenstra +Derek Ditch +Bernd Wurst +Simon Déziel +drakosha +bytebybyte +Marcel Stimberg +Oliver Gerlich Thanks to all Launchpad translators. diff -Nru sbackup-0.11.4/ChangeLog sbackup-0.11.6/ChangeLog --- sbackup-0.11.4/ChangeLog 2011-02-13 18:22:21.000000000 +0100 +++ sbackup-0.11.6/ChangeLog 2013-09-17 20:49:58.000000000 +0200 @@ -1,3 +1,80 @@ +sbackup (0.11.6) + + * Add XFCE4 to list of supported desktop environments to enable status + indicator on xfce4 + * [Fix] LP: #1174124 Catch invalid path selections to avoid TypeErrors + when coercing to Unicode. Replace FileChooserButton with text entry + to avoid problems when selecting destination paths. + * [Fix] LP: #1159705 set default setting for log level as string, not as + integer in order to fix a KeyError if no log level is defined in config + file. Also make sure, a string is processed when setting GUI widgets + using the log level value. + * [Fix] LP: #1190224 Restore behaviour of GioOperations.path_exists. + This caused a regression which let the backup fail. + * merge fix for bug 632605. Thanks to Mascha + * merge from trunk: add french desktop entry + * fix internal helper tool script + +sbackup (0.11.5) + * translations updated + * [Fix] LP: #1000171 make it backwards compatible because upgrade-backups + is incredibly slow and not reliable: + added restore utility which provides legacy support + using the 0.10.5 algorithm. Command must be + executed from terminal: 'sbackup-legacy-restore + BACKUP_PATH FILE_OR_DIR_TO_RESTORE [TARGET_DIR]' + or for more ease of use with GTK gui: + 'sbackup-legacy-restore --gui'. + * remove 'backup upgrade' feature and 'rebase snapshot' feature since it + is not reliable and can cause severe user data loss + * [Fix] LP: #1097465 Regular expressions defined in default configuration + can be improved: + -do not exclude specific types of files e.g. mp3, avi + -fix regex for .gvfs, trash, cache etc. so these apply + to 'top-level' directories + -add a default regex for lock directories + (e.g. $HOME/.mozilla/lock) + -add a default regex for $HOME/.cache directory + * [Fix] LP: #785512 Backup files are not protect from local user access: + make the snapshot directories RWX only by owner + (existing snapshots are not affected by this fix). + * Apply patch from Simon Déziel to make the temp directory + RWX only by owner instead of by all. (LP: #785495) + * [Fix] LP: #330680 fails if target path contains #: + fixed by not allowing fragments when parsing target + path and using quote/unquote to escape # properly + (FIXME: this fix does not cover target paths containing + special chars ; or ?) + * [Fix] LP: #980786 Don't complain about non-accessable excluded files: + order of checks when inspecting file system revised. It + is now first checked whether a file is excluded before + it is actually accessed. + Thanks for Bernd Wurst for the suggestion. + * [Fix] LP: #670646 sbackup-gtk crashes while starting: invalid literal + for int(): + ignore ValueError from urlparse when parsing port + * [Fix] LP: #888367 TypeError: argument of type 'int' is not iterable: + Try to fix type error by not using interpolation when + getting items From ConfigParser. + * [Fix] LP: #173490 Pre/Post backup script hooks: + applied patch suggested by Derek Ditch + * [Fix] LP: #918099 System menu names should include 'admin' or similar: + applied patch suggested by Anton (feenstra) + * [Fix] LP: #875634 sbackup's tar very slow due to erroneous backup size + calculation: + Sometimes the calculation of the space required goes + badly wrong and we could end-up With _checkp=1 for + 30GB to save, making tar VERY slow. + Fixed by setting minimum value to 100. Thanks to + Thibault Godouet for the patch. + * added exception handling in case of not implemented + 'attach_to_status_icon' method (e.g. Debian Wheezy) + * [Fix] LP: #768080 incremental snapshots store more files than needed: + add TAR option '--no-check-device'. Thanks to + Rogach (platon7pronko) and Felix Griewald (tiiunder) + for the patch. + * Correctly set package format to 3.0 (quilt). Thanks to Marc Deslauriers. + sbackup (0.11.4) * [Fix] LP: #714916 Unhandled error in gio backend when looking up verbose error message @@ -17,8 +94,8 @@ (SMTP server etc.) * [Fix] LP: #695613 Empty notification popup due to invalid markup * [Fix] LP: #671785 Parsing remote URIs fails when username or password - contains special characters; quote special characters - to comply with RFC 1738 sec. 3.1 + contains special characters; quote special characters + to comply with RFC 1738 sec. 3.1 * [Fix] LP: #675361 Restore process fails with error 'is not a file' while copying * [Fix] LP: #696183 Failed to set GID to `admin`; improved handling of diff -Nru sbackup-0.11.4/data/desktop/sbackup-config.desktop.in sbackup-0.11.6/data/desktop/sbackup-config.desktop.in --- sbackup-0.11.4/data/desktop/sbackup-config.desktop.in 2011-02-13 18:22:29.000000000 +0100 +++ sbackup-0.11.6/data/desktop/sbackup-config.desktop.in 2013-09-17 20:49:58.000000000 +0200 @@ -9,12 +9,14 @@ Name[ja]=バックアップの設定 # Comment=Simple Backup configuration tool for non-admins. +Comment[fr]=Outil de configuration de Simple Backup pour les non-administrateurs. Comment[de]=Simple Backup Konfiguration für Nicht-Admins. Comment[pt_BR]=Configure como seus backups são feitos (non-admins). Comment[es]=Configuración de Simple Backup para no administradores. Comment[ja]=バックアップの設定・実行ツールを起動します # GenericName=Backup configuration tool +GenericName[fr]=Utilitaire de sauvegarde GenericName[de]=Backup Einstellungen GenericName[es]=Herramienta de copia de seguridad # diff -Nru sbackup-0.11.4/data/desktop/sbackup-config-su.desktop.in sbackup-0.11.6/data/desktop/sbackup-config-su.desktop.in --- sbackup-0.11.4/data/desktop/sbackup-config-su.desktop.in 2011-02-13 18:22:29.000000000 +0100 +++ sbackup-0.11.6/data/desktop/sbackup-config-su.desktop.in 2013-09-17 20:49:58.000000000 +0200 @@ -1,20 +1,22 @@ [Desktop Entry] Type=Application # -Name=Simple Backup-Configuration -Name[fr]=Configurateur de la Simple Backup -Name[de]=Simple Backup-Einstellungen -Name[pt_BR]=Configuração do Backup -Name[es]=Configuración de Simple Backup -Name[ja]=バックアップの設定 +Name=Simple Backup-Configuration for admins +Name[fr]=Configurateur de la Simple Backup pour les administrateurs +Name[de]=Simple Backup-Einstellungen für Admins +Name[pt_BR]=Configuração do Backup (for admins) +Name[es]=Configuración de Simple Backup (for admins) +Name[ja]=バックアップの設定 (for admins) # Comment=Simple Backup configuration tool for admins. Requires superuser rights. +Comment[fr]=Outil de configuration de Simple Backup pour les administrateurs. Requiers les droits de superutilisateur. Comment[de]=Simple Backup Konfiguration für Administratoren. Erfordert Superuser-Rechte. Comment[pt_BR]=Configure como seus backups são feitos. Requires superuser rights. Comment[es]=Configuración de Simple Backup para administradores. Requiere privilegios de superusuario. Comment[ja]=バックアップの設定・実行ツールを起動します # GenericName=Backup configuration tool +GenericName[fr]=Utilitaire de sauvegarde GenericName[de]=Backup Einstellungen GenericName[es]=Herramienta de copia de seguridad # diff -Nru sbackup-0.11.4/data/desktop/sbackup-restore.desktop.in sbackup-0.11.6/data/desktop/sbackup-restore.desktop.in --- sbackup-0.11.4/data/desktop/sbackup-restore.desktop.in 2011-02-13 18:22:29.000000000 +0100 +++ sbackup-0.11.6/data/desktop/sbackup-restore.desktop.in 2013-09-17 20:49:58.000000000 +0200 @@ -2,19 +2,21 @@ Type=Application # Name=Simple Backup-Restoration +Name[fr]=Simple Backup-Restauration Name[de]=Simple Backup-Wiederherstellung Name[pt_BR]=Restauração de Backup Name[es]=Restauración de copia de seguridad Name[ja]=バックアップの復元 # Comment=Simple Backup restoration tool for non-admins. +Comment[fr]=Outil de Restauration de Simple Backup pour les non-administrateurs. Comment[de]=Simple Backup Wiederherstellung für Nicht-Admins. Comment[pt_BR]=Restaure seu backup feito anteriormente (non-admins). Comment[es]=Restauración de copia de seguridad para no administradores. Comment[ja]=バックアップの復元ツールを起動します # GenericName=Restoration tool -GenericName[fr_FR]=Utilitaire de restauration +GenericName[fr]=Utilitaire de restauration GenericName[de]=Backup Wiederherstellung GenericName[es]=Herramienta de restauración # diff -Nru sbackup-0.11.4/data/desktop/sbackup-restore-su.desktop.in sbackup-0.11.6/data/desktop/sbackup-restore-su.desktop.in --- sbackup-0.11.4/data/desktop/sbackup-restore-su.desktop.in 2011-02-13 18:22:29.000000000 +0100 +++ sbackup-0.11.6/data/desktop/sbackup-restore-su.desktop.in 2013-09-17 20:49:58.000000000 +0200 @@ -1,20 +1,22 @@ [Desktop Entry] Type=Application # -Name=Simple Backup-Restoration -Name[de]=Simple Backup-Wiederherstellung -Name[pt_BR]=Restauração de Backup -Name[es]=Restauración de copia de seguridad -Name[ja]=バックアップの復元 +Name=Simple Backup-Restoration for admins +Name[fr]=Simple Backup-Restauration pour les administrateurs +Name[de]=Simple Backup-Wiederherstellung für Admins +Name[pt_BR]=Restauração de Backup (for admins) +Name[es]=Restauración de copia de seguridad (for admins) +Name[ja]=バックアップの復元 (for admins) # Comment=Simple Backup restoration tool for admins. Requires superuser rights. +Comment[fr]=Outil de Restauration de Simple Backup pour les administrateurs. Requiers les droits de superutilisateur. Comment[de]=Simple Backup Wiederherstellung für Admins. Erfordert Superuser-Rechte. Comment[pt_BR]=Restaure seu backup feito anteriormente. Requires superuser rights. Comment[es]=Restauración de Simple Backup para administradores. Requiere privilegios de superusuario. Comment[ja]=バックアップの復元ツールを起動します # GenericName=Restoration tool -GenericName[fr_FR]=Utilitaire de restauration +GenericName[fr]=Utilitaire de restauration GenericName[de]=Backup Wiederherstellung GenericName[es]=Herramienta de restauración # diff -Nru sbackup-0.11.4/data/sbackup.conf.example sbackup-0.11.6/data/sbackup.conf.example --- sbackup-0.11.4/data/sbackup.conf.example 2011-02-13 18:22:29.000000000 +0100 +++ sbackup-0.11.6/data/sbackup.conf.example 2013-09-17 20:49:58.000000000 +0200 @@ -1,42 +1,79 @@ -# Simple backup configuration file +# Example of sbackup configuration file +# valid for sbackup >= 0.11.5 + -[general] -#This is used as a base point for all the fuse mount point -mountdir = /mnt/sbackup/ -# Backup target can be a local directory or a GnomeVFS compartible URI -# (only ssh://user:pass@example.com/home/user/backup/ URIs are tested for now) -target=/var/backup -#target=ssh://user:pass@example.com/home/user/backup/ +[general] +# basic settings -# Where to put a lockfile (Leave the default) -lockfile=/var/lock/sbackup.lock # Maximal interval between two full backups (in days) -maxincrement = 21 +maxincrement = 7 + + +# format of snapshot archive +# none - no compression (tar) +# gzip - gzip compression (tar.gz) +# bzip2 - bzip compression (tar.bz) +format = gzip + + +# Follow symbolic links and backup link target instead of link +# 1 = enabled, 0 = disabled (do not follow symbolic links) +followlinks = 0 + + +# Backup destination (target) can be a local directory +# or a GIO/GVFS compatible URI +target = /media/externaldisk/backups +#target = sftp://john.doe:passphrase@sftp.hidrive.strato.com/users/john.doe/ + + +# remove backups +# purge = log - use a logarithmic scheme of removals +# purge = 0 - do not remove snapshots +# any positive number - remove snapshots older than x days +purge = 30 -# Backup format: -# 1 - All files are stored in the files.tgz -format = 1 -# Run for others (This option is for root only) : will run normal users config files after the root run is finished -run4others = 1 +# mount point for userspace filesystems when using sbackup's fuse plugins +mountdir = /home/johndoe/.local/share/sbackup/mountdir + + +# where to put a lockfile (leave the default) +lockfile = /var/lock/sbackup/sbackup.lock + + +# Split snapshot archive into chunks of given size in MiB (1024*1024 bytes) +# 0 = disabled (no splitting) +# positive number = size of chunks in MiB +splitsize = 0 -# Backup links : use 1 to activate and 0 to deactivate (default = 0 ) -backuplinks=1 # Set the package manager command to backup the package list packagecmd = + + [log] -# level : 10 = DEBUG, 20 = INFO, 50 = ERROR +# level of details in logs and where to find them + + +# log level : 10 = DEBUG, 20 = INFO, 30 = Warning, 40 = ERROR level = 20 -# where to put the logfile when running , the logfile will be moved to the snapshot dir at the end of the backup -#file = /var/log/sbackup.log -# Backup report +# this is the base logfile name. It is extended by the current time +# when a logfile is actually created. +# the logfile will be copied to the snapshot dir at the end of the backup +file = /home/jdoe/.local/share/sbackup/log/sbackup.log + + + [report] +# options for sending Backup reports via email + + #from = foo@foo.foo #to = foo@foo.foo #smtpserver = smtp.foo.com @@ -48,21 +85,34 @@ #smtpuser = foo #smtppassword = pass + + [schedule] -#anacron = daily -#cron = +# define automatic backups +# only available for superuser/root -[dirconfig] +# define auto-backups either the simple way using anacron +#anacron = hourly|daily|weekly|monthly + + +# or the exact way using a cron command (you should know how this looks when +# using this option) +#cron = ... + + + +[dirconfig] # In this section you describe, what directories to backup and what to skip # More precise commands override wider ones, for example: # /var=1 # This means that the whole /var directory is to be backed up # /var/cache=0 # This means the /var/cache and its sub-directories are not # # to be backed up # In this case all /var, except /var/cache will be backed up -# It works the othe way around too +# It works the other way around too # by default nothing is backed up + /etc/=1 /home/=1 /usr/local/=1 @@ -75,7 +125,11 @@ /tmp/=0 /var/tmp/=0 + + [exclude] +# Define what files/paths to exclude from the backup + # Comma-separated list of regular expressions to exclude from backup # use this to exclude certain types of files or directories @@ -83,10 +137,28 @@ # Note: If any of these expressions matches within the whole pathname # of the file, it will NOT be backuped. Keep this list as specific # and as short as possible. +regex=^/home/[^/]+?/\.gvfs(/|$),^/home/[^/]+?/\.thumbnails(/|$), + ^/home/[^/]+?/\..+/[tT]rash(/|$), + ^/home/[^/]+?/\.cache(/|$), ~$ -regex=\.mp3,\.avi,\.mpeg,\.mpg,\.mkv,\.ogg,\.ogm,\.tmp,/home/[^/]+?/\.thumbnails/,/home/[^/]+?/\.Trash,/home/[^/]+?/\..+/[cC]ache # Do not backup files bigger then this (in bytes) +# 0 = disabled +maxsize=0 + + + +[hooks] +# specify scripts that should run, just leave it out if not required +# scripts must be executable (chmod +x) and will be run with same privileges +# as your backup process. So, be careful! + + +pre-backup = +post-backup = + -maxsize=100000000 +[places] +# Installation prefix for internal use only. Will be removed in future versions +prefix = /usr diff -Nru sbackup-0.11.4/data/ui/sbackup-config.glade sbackup-0.11.6/data/ui/sbackup-config.glade --- sbackup-0.11.4/data/ui/sbackup-config.glade 2011-02-13 18:22:28.000000000 +0100 +++ sbackup-0.11.6/data/ui/sbackup-config.glade 2013-09-17 20:49:58.000000000 +0200 @@ -1,35 +1,42 @@ - + + + - - - + + 320 + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 - Exclude file type - True - center-on-parent + Configuration Profile Manager + True dialog - True - False + sbackupConfApp - + True - - + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + True - 6 + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + end - - Standard file types: + + gtk-close True True - False - True - True - + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + False @@ -37,37 +44,51 @@ 0 + + + False + True + end + 0 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 12 - + + 400 True - 0 - mp3 -avi -mpeg -mpg -ogg - - + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + You can set up multiple configuration profiles which are processed when performing a backup. Each profile has its own set of settings including backup destination, backup format etc. + True + True + 0 False False - 1 + 0 - + True + False + 6 - - Custom defined file type with + True - True - False - True - True - ftype_st - + False + 0 + <b>Configuration profiles</b> + True False @@ -76,53 +97,159 @@ - + True - False - True - + False + 12 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + automatic + automatic + in + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + + + + + True + True + 0 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + start + + + gtk-add + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + + + + False + False + 0 + + + + + gtk-remove + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + + + + False + False + 1 + + + + + gtk-edit + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + + + + False + False + 2 + + + + + False + False + 1 + + + + + True + True 1 - - - True - 5 - file extension - - - False - False - 2 - - - False - False - 12 - 2 + True + True + 1 - 2 + True + True + 1 + + + + + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + True + dialog + True + ProfileManagerDialog + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 - + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK end - + gtk-cancel -6 True True - True - False + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True @@ -132,14 +259,18 @@ - + gtk-ok -5 True True + True + True True True True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True @@ -151,71 +282,152 @@ False + True end 0 - - - - - 6 - Exclude by regex - dialog - True - False - - - True - 6 - + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 - 6 + 18 - + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Enter a regular expression. -Files and directories matching this expression will be excluded from backup. + <b>Add new profile</b> + +Please enter the new profile name and set the according checkbox in order to enable resp. disable it. + True True False - False + True 0 - + True - True - ^.*\.mp3$ + False + 6 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Profile name + + + False + False + 0 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + False + False + True + True + + + True + True + 1 + + + + + True + True + 0 + + + + + Enabled + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + half + True + True + + + False + False + 1 + + + True + True 1 False - False - 2 + True + 1 + + + + + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + True + True + dialog + True + True + True + sbackupConfApp + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 - + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK end - - gtk-cancel - -6 + + gtk-yes + -8 True True - True - False + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True @@ -225,74 +437,65 @@ - - gtk-ok - -5 + + gtk-no + -9 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + + + False + False + 1 + + + + + gtk-cancel True True + True + True True True - False + True + False True False False - 1 + 2 False + True end 0 - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - Enter the remote target to include - center-on-parent - dialog - True - False - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False 6 - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Choose a plugin to get the format - - - False - False - 0 - - - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False 6 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Choose your plugin : + False + gtk-dialog-warning + 6 False @@ -301,77 +504,87 @@ - + True - + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Save changed configuration?</b> + +The configuration has changed. If you want to use the modified configuration, you have to save it. + +Do you want to save the configuration now? + True + True + False + False 1 - False - False - 1 + True + True + 0 - False - False + True + True 1 - - + + + + + False + 5 + Select destination folder... + GtkFileChooserDialog + True + True + dialog + sbackupConfApp + select-folder + + + True + False + 2 + + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - 6 + False + end - + + gtk-cancel + -6 True True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False + True + False + False 0 - + + gtk-ok + -10 True True True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-apply - - - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Check - - - 1 - - - - + False + True False @@ -382,137 +595,45 @@ False - False - 2 + True + end + 0 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - end - - - gtk-ok - -5 - True - True - True - True - False - True - - - False - False - 0 - - - - - gtk-cancel - -6 - True - True - True - False - True - - - - False - False - 1 - - - - - False - end - 0 - + + - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + False 6 + Set remote target True True dialog - True - True - True - sbackupConfApp - False + False - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 12 - - - True - 6 - - - True - 6 - - - True - gtk-dialog-warning - 6 - - - False - False - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Save changed configuration?</b> - -The configuration has changed. If you want to use the modified configuration, you have to save it. - -Do you want to save the configuration now? - True - True - - - False - False - 1 - - - - - 0 - - - - - 1 - - + False + 2 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False end - - gtk-yes - -8 + + gtk-cancel + -6 True True + True True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True True @@ -522,96 +643,46 @@ - - gtk-no - -9 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - False - False - 1 - - - - - gtk-cancel + + _Connect + -10 True True - True - True - True True True - True + False + True False False - 2 + 1 False + True end 0 - - - - - 320 - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - Configuration Profile Manager - True - dialog - sbackupConfApp - False - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False 6 12 - - 400 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - You can set up multiple configuration profiles which are processed when performing a backup. Each profile has its own set of settings including backup destination, backup format etc. - True - True - 0 - - - False - False - 0 - - - - + True + False 6 - + True - 0 - <b>Configuration profiles</b> - True + False + Type of service False @@ -620,194 +691,358 @@ - + True - 12 + False + 0 + + + + True + True + 1 + + + + + False + True + 0 + + + + + True + False + 12 + + + True + False + 12 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False 6 - + + True + False + 0 + Hostname + + + False + True + 0 + + + + True True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - automatic - automatic - in - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - + + False + False + True + True + + + True + True + 1 + + + + + True + True + 0 + + + + + True + False + 6 + + + True + False + 0 + <b>Details</b> + True + True + True 0 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - start - - - gtk-add - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - False - False - 0 - - - - - gtk-remove - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - False - False - 1 - - + False + 6 - - gtk-edit + True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - + False + 6 + + + True + False + 4 + 2 + 6 + 6 + + + True + False + 0 + Port + + + GTK_FILL + + + + + True + False + 0 + Path + + + 1 + 2 + GTK_FILL + + + + + True + False + 0 + Username + + + 2 + 3 + GTK_FILL + + + + + True + True + + False + False + True + True + + + 1 + 2 + + + + + True + True + + False + False + True + True + + + 1 + 2 + 1 + 2 + + + + + True + True + + False + False + True + True + + + 1 + 2 + 2 + 3 + + + + + True + False + 0 + Password + + + 3 + 4 + GTK_FILL + + + + + True + True + + True + False + False + True + True + + + 1 + 2 + 3 + 4 + + + + + True + True + 0 + + + + + True + False + 6 + + + Show password + True + True + False + False + True + + + + + + True + True + 1 + + - - False - False - 2 - - False - False + True + True 1 + + True + True + 1 + - - 1 - + True + True 1 + True + True 1 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - end - - - gtk-close - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - False - False - 0 - - - - - False - end - 0 - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + False 6 + Warning + True + center-on-parent True dialog - True - ProfileManagerDialog - False - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 + False - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False 6 - 18 + 12 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Add new profile</b> - -Please enter the new profile name and set the according checkbox in order to enable resp. disable it. - True - True + False + gtk-dialog-warning + 6 False + False 0 True - 6 + False - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 + False + 0 + Content here + True + + + True + True + 0 + + + + + True + False - + + Help True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Profile name + True + True + Show help topic about default values. + False + none + ghelp:sbackup#defaults False @@ -815,32 +1050,150 @@ 0 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - 1 - - + False + False + 1 + + + + + True + True + 1 + + + + + True + True + 0 + + + + + True + False + end + + + _Set + -10 + True + True + True + False + True + + + False + False + 0 + + + + + gtk-cancel + -6 + True + True + True + True + False + True + True + + + False + False + 1 + + + + + False + True + end + 1 + + + + + + + False + 6 + True + center-on-parent + True + dialog + + + True + False + + + True + False + 6 + 12 + + + True + False + gtk-dialog-question + 6 + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0 + <b>Create a backup now?</b> + +Initiates a backup process in the background. Each of the enabled profiles are executed. You can force the creation of a full snapshot by enabling the option below. + +Do want to create a backup now? + True + True + + + True + True 0 - - Enabled + True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - half - True - True + False + + + Make a full backup + True + True + False + False + True + + + False + True + 0 + + False @@ -850,28 +1203,95 @@ + True + True + 1 + + + + + True + True + 0 + + + + + True + False + end + + + gtk-yes + -10 + True + True + True + False + True + True + + + False + False + 0 + + + + + gtk-no + -6 + True + True + True + True + False + True + True + + + False + False 1 False + True + end 1 + + + + + False + 6 + Exclude file type + True + center-on-parent + dialog + True + + + True + False - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False end - + gtk-cancel -6 True True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False + False True @@ -881,17 +1301,15 @@ - + gtk-ok -5 True True - True - True True True True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True @@ -903,613 +1321,1134 @@ False + True end 0 - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Simple Backup Suite - - - - - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + 6 - + + Standard file types: True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _File - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - Reload - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - - True - gtk-refresh - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - gtk-save - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - True - - - - - - Save as... - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - - True - gtk-save-as - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - gtk-quit - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - True - - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Tools - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - Set default settings... - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - - True - gtk-revert-to-saved - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - Profile Manager... - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - - True - gtk-home - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - Make backup now - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - - True - gtk-harddisk - - - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Help - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - _View all help topics - True - True - False - - - - - True - gtk-help - - - - - - - _About this program - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - False - - - - True - gtk-about - - - - - - - - + True + False + False + True + True + + + False + False + 0 + - - - BONOBO_DOCK_ITEM_BEH_EXCLUSIVE | BONOBO_DOCK_ITEM_BEH_NEVER_VERTICAL | BONOBO_DOCK_ITEM_BEH_LOCKED - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + 0 + mp3 +avi +mpeg +mpg +ogg + + + + + False + False + 1 + + + + + True + False - + + Custom defined file type with True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Set default settings... - Defaults - gtk-revert-to-saved - + True + False + False + True + True + ftype_st + False - True + False + 0 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Reload configuration - Reload - gtk-refresh - + False + True + False + False + True + True + - False - True + True + True + 1 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Save configuration - Save - gtk-save - + False + 5 + file extension False - True - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Make a backup now - Backup Now - gtk-harddisk - - - - False - True + False + 2 + + + False + False + 12 + 2 + + + + + True + True + 2 + + + + + + + False + 6 + Exclude by regex + dialog + True + + + True + False + 6 + + + True + False + end + + + gtk-cancel + -6 + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + -5 + True + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + 6 + + + True + False + 0 + Enter a regular expression. +Files and directories matching this expression will be excluded from backup. + True + + + False + False + 0 + + + + + True + True + ^.*\.mp3$ + False + False + True + True + + + True + True + 1 + + + + + False + False + 2 + + + + + + + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + Enter the remote target to include + center-on-parent + dialog + True + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + end + + + gtk-ok + -5 + True + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-cancel + -6 + True + True + True + False + False + True + + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 6 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Choose a plugin to get the format + + + False + False + 0 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 - + True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Choose your plugin : False + False + 0 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Open the profile manager - Profiles - gtk-copy - + False + - False - True + True + True + 1 False + False + 1 + + + + + False + False + 1 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 6 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + False + True + True + + + True + True 0 - + True - 0 - 3 - 3 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + - + True - 12 + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-apply + + + True + True + 0 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Check + + + True + True + 1 + + + + + + + False + False + 1 + + + + + False + False + 2 + + + + + + + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Simple Backup Suite + + + + + False + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + _File + True + + + True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - 3 - 6 - 18 - + + Reload True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - none -gzip -bzip2 - + False + False + + + + True + False + gtk-refresh + + - - 1 - 2 - 1 - 2 - - - + True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Compression format -Default is set to uncompressed backups. - True - fill - - 1 - 2 - - + + gtk-save True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - You can split the snapshot to make backup on some filesystem that doesn't support large files. This functionality can not be used if the backup is compressed. - 0 - - - - False - False - 0 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - 0 0 20480 1 10 10 - True - - - - False - False - 3 - 1 - - + False + True + True + - - 1 - 2 - 2 - 3 - - - + + Save as... True - 2.2351741291171123e-10 - Do a full backup at least once every - True - fill + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + False + + + + True + False + gtk-save-as + + - + True - True - Unless a set number of days has passed since the last full backup, incremental backups will be done. - - 7 0 1000 1 10 10 - 1 - - + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - 1 - 2 - - - + + gtk-quit True - 0 - days + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + True + - - 2 - 3 - + + + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + _Tools + True + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + + Set default settings... True - - - True - 0 - - - - 0 - - - - + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + False + + + True - 0 - MiB + False + gtk-revert-to-saved - - end - 1 - - - 2 - 3 - 2 - 3 - - + True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - You can split the snapshot to make backup on some filesystem that doesn't support large files. This functionality can not be used if the backup is compressed. - 0 - Split backup archives into several chunks - True - 0 - - - False - 0 - - + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - 2 - 3 - - + + Profile Manager... + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + False + + + + True + False + gtk-home + + + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + + Make backup now + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + False + + + + True + False + gtk-harddisk + + + - - False - 0 - + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + _Help + True - - False - 12 + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - False - - - Help - False - True - True - Show help topic about configuration GUI. - none - ghelp:sbackup#config-gtk + + _View all help topics + True + False + False + True + False + + + + + True + False + gtk-help - - False - False - end - 0 - - - False - False - 0 - - + + _About this program + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + False + + + + True + False + gtk-about + + + - - False - end - 1 - + + + + + BONOBO_DOCK_ITEM_BEH_EXCLUSIVE | BONOBO_DOCK_ITEM_BEH_NEVER_VERTICAL | BONOBO_DOCK_ITEM_BEH_LOCKED + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True - General + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Set default settings... + False + Defaults + gtk-revert-to-saved + - False - tab + False + True - + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Reload configuration + False + Reload + gtk-refresh + + + + False + True + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Save configuration + False + Save + gtk-save + + + + False + True + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + False + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Make a backup now + False + Backup Now + gtk-harddisk + + + + False + True + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + False + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Open the profile manager + False + Profiles + gtk-copy + + + + False + True + + + + + False + True + 0 + + + + + True + False + 0 + 3 + 3 + + True + False 12 - 18 - + True - 6 + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 + 3 + 6 + 18 - + True - 0 - <b>Included files and directories</b> - True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + none +gzip +bzip2 + - False - False - 0 + 1 + 2 + 1 + 2 + - + True - 12 - - - True - 12 - + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Compression format +Default is set to uncompressed backups. + True + fill + + + 1 + 2 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + You can split the snapshot to make backup on some filesystem that doesn't support large files. This functionality can not be used if the backup is compressed. + 0 + + + + False + False + 0 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + False + False + True + True + 0 0 20480 1 10 0 + True + + + + False + False + 3 + 1 + + + + + 1 + 2 + 2 + 3 + + + + + + True + False + 2.2351741291171123e-10 + Do a full backup at least once every + True + fill + + + + + True + True + Unless a set number of days has passed since the last full backup, incremental backups will be done. + + False + False + True + True + 7 0 1000 1 10 0 + 1 + + + + + 1 + 2 + + + + + + True + False + 0 + days + + + 2 + 3 + + + + + True + False + + + True + False + 0 + + + + True + True + 0 + + + + + True + False + 0 + MiB + + + True + True + end + 1 + + + + + 2 + 3 + 2 + 3 + + + + + True + False + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + You can split the snapshot to make backup on some filesystem that doesn't support large files. This functionality can not be used if the backup is compressed. + 0 + Split backup archives into several chunks + True + 0 + + + False + True + 0 + + + + + 2 + 3 + + + + + + + + False + True + 0 + + + + + False + False + 12 + + + False + False + + + Help + False + True + True + Show help topic about configuration GUI. + False + none + ghelp:sbackup#config-gtk + + + False + False + end + 0 + + + + + False + False + 0 + + + + + + + + False + True + end + 1 + + + + + + + True + False + General + + + False + tab + + + + + True + False + 12 + 18 + + + True + False + 6 + + + True + False + 0 + <b>Included files and directories</b> + True + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 12 + True True @@ -1529,12 +2468,15 @@ + True + True 0 True + False 6 end @@ -1543,19 +2485,23 @@ True True True + False True + False 0 0 True + False 6 True + False gtk-remove @@ -1567,6 +2513,7 @@ True + False Remove True @@ -1593,19 +2540,23 @@ True True True + False True + False 0 0 True + False 6 True + False gtk-add @@ -1617,6 +2568,7 @@ True + False Add File True @@ -1644,19 +2596,23 @@ True True True + False True + False 0 0 True + False 6 True + False gtk-add @@ -1668,6 +2624,7 @@ True + False Add Directory True @@ -1691,6 +2648,7 @@ False + True 1 1 @@ -1699,11 +2657,15 @@ + True + True 1 + True + True 0 @@ -1715,6 +2677,7 @@ True + False Include @@ -1726,15 +2689,18 @@ True + False 12 18 True + False 6 True + False 0 <b>Excluded files and directories</b> True @@ -1754,6 +2720,7 @@ True + False 6 12 @@ -1777,12 +2744,15 @@ + True + True 0 True + False 6 end @@ -1791,19 +2761,23 @@ True True True + False True + False 0 0 True + False 6 True + False gtk-remove @@ -1815,6 +2789,7 @@ True + False Remove True @@ -1841,19 +2816,23 @@ True True True + False True + False 0 0 True + False 6 True + False gtk-add @@ -1865,6 +2844,7 @@ True + False Add File True @@ -1892,19 +2872,23 @@ True True True + False True + False 0 0 True + False 6 True + False gtk-add @@ -1916,6 +2900,7 @@ True + False Add Directory True @@ -1949,6 +2934,7 @@ True + False Paths center @@ -1960,6 +2946,7 @@ True + False 6 12 @@ -1982,12 +2969,15 @@ + True + True 0 True + False 6 end @@ -1996,19 +2986,23 @@ True True True + False True + False 0 0 True + False 6 True + False gtk-remove @@ -2020,6 +3014,7 @@ True + False Remove True @@ -2047,19 +3042,23 @@ True True True + False True + False 0 0 True + False 6 True + False gtk-add @@ -2071,6 +3070,7 @@ True + False Add True @@ -2106,6 +3106,7 @@ True + False File types center @@ -2118,6 +3119,7 @@ True + False 6 12 @@ -2140,12 +3142,15 @@ + True + True 0 True + False 6 end @@ -2154,19 +3159,23 @@ True True True + False True + False 0 0 True + False 6 True + False gtk-remove @@ -2178,6 +3187,7 @@ True + False Remove True @@ -2205,19 +3215,23 @@ True True True + False True + False 0 0 True + False 6 True + False gtk-add @@ -2229,6 +3243,7 @@ True + False Add True @@ -2264,6 +3279,7 @@ True + False Regular Expressions center @@ -2276,775 +3292,330 @@ - True - 12 - 18 - - - True - 6 - - - Do not backup files bigger than - True - True - False - True - False - True - - - - False - False - 0 - - - - - True - True - - 100 0 10240 1 10 10 - 1 - True - if-valid - - - - False - False - 1 - - - - - True - MiB - - - False - False - 2 - - - - - False - False - 0 - - - - - True - 6 - - - Follow symbolic links - True - True - False - False - True - - - - False - False - 0 - - - - - False - False - 1 - - - - - 3 - - - - - True - Others - center - - - 3 - False - tab - - - - - 1 - - - - - 0 - - - - - 2 - - - - - True - Exclude - - - 2 - False - tab - - - - - True - 12 - - - True - 18 - - - True - - - Use default backup directory - True - True - False - True - True - True - - - - False - 0 - - - - - True - 18 - - - True - - - True - 0 - /var/backup - - - False - False - 4 - 0 - - - - - - - 1 - - - - - 0 - - - - - True - - - Use custom local backup directory - True - True - False - True - True - True - dest1 - - - - False - 0 - - - - - True - 18 - - - True - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - select-folder - Select the destination folder - - - - False - False - 0 - - - - - - - 1 - - - - - 1 - - - - - True - - - Use a remote site - True - True - False - True - True - True - dest1 - - - - False - 0 - - - - - True - 18 - - - True - 12 - - - True - gtk-dialog-warning - 17 - 1 - - - False - False - 0 - - - - - True - True - False - - ssh://username:password@example.com/remote/dir/ - - - 1 - - - - - True - end - - - Connect... - True - True - True - - - - False - False - 0 - - - - - False - False - 2 - - - - - - - 1 - - - - - False - 2 - - - - - False - 0 - - - - - True - 12 - - - False - - - Help - False - True - True - True - Show help topic about configuration GUI. - none - ghelp:sbackup#config-gtk - - - False - False - end - 0 - - - - - False - False - 0 - - - - - 6 - - - True - True - gtk-dialog-error - 1 - - - False - False - 0 - - - - - True - True - 5 - 5 - <i>The selected destination is not writeable with current permissions. Backups cannot be stored there.</i> - True - center - True - - - False - False - 1 - - - - - False - 1 - - - - - False - end - 1 - - - - - 3 - - - - - True - Destination - - - 3 - False - tab - - - - - True - 12 - - - True - 3 - 3 - 6 - 18 - - - _No scheduled backups - True - True - False - True - True - True - rdbtn_simple_schedule - - - - 3 - - - - - - _Simple - True - True - False - True - This option will make a backup not at a precise time but when the computer is up. - True - 1 - True - - - - 1 - 2 - - - - - - _Custom - True - True - False - True - True - rdbtn_simple_schedule - - - - 2 - 3 - - - - - - True - 1 - 4 - Do backups - right - True - - - 1 - 2 - 1 - 2 - - - - - - True - 1 - 4 - Cron time definition - True - - - 1 - 2 - 2 - 3 - - - - - - True - False - True - - 10 - 0 4 * * * - - - - 2 - 3 - 2 - 3 - - - - - - True - 1 - 0 - 1 - on - hourly -daily -weekly -monthly - - - - 2 - 3 - 1 - 2 - - - - - - False - 0 - - - - - True - 12 - - - False - - - Help - False - True - True - Show help topic about scheduled backups. - none - ghelp:sbackup#schedule - - - False - False - end - 0 - - - - - False - 0 - - - - - True - 6 - - - True - gtk-dialog-info - 1 + True + False + 12 + 18 + + + True + False + 6 + + + Do not backup files bigger than + True + True + False + False + True + False + True + + + + False + False + 0 + + + + + True + True + + False + False + True + True + 100 0 10240 1 10 0 + 1 + True + if-valid + + + + False + False + 1 + + + + + True + False + MiB + + + False + False + 2 + + + + + False + False + 0 + + + + + True + False + 6 + + + Follow symbolic links + True + True + False + False + False + True + + + + False + False + 0 + + + + + False + False + 1 + + - False - False - 0 + 3 - + True - 5 - 5 - <small>You can configure scheduled (i.e. automated) backups either simply by choosing an interval or precisely by a custom cron definition. See "man 5 crontab" for cron time definition format.</small> - True + False + Others center - True - False - False - 1 + 3 + False + tab - False + True + True 1 - False - end - 1 + True + True + 0 - 4 + 2 - + True - Schedule + False + Exclude - 4 + 2 False tab - + True + False 12 - + True - 6 - - - Enable purging of old backups - True - True - False - True - True - - - - False - False - 0 - - + False + 18 - + True - 18 + False - + + Use custom local backup directory True - 18 + True + False + False + True + True + True + + + + False + True + 0 + + + + + True + False + 18 - + True - 6 + False + 12 - - Simple cut-off: Erase all backups older than + True True - False - True - True - True - + False + + False + False + True + True - False - False + True + True 0 - + True - True - - 5 - 30 - + False + end + + + Browse... + True + True + True + False + + + + False + False + 0 + + False + False 1 + + + + + True + True + 1 + + + + + True + True + 0 + + + + + True + False + + + Use a remote site + True + True + False + False + True + True + dest2 + + + + False + True + 0 + + + + + True + False + 18 + + + True + False + 12 - + True - days + False + gtk-dialog-warning + 17 + 1 False False - 2 + 0 + + + + + True + True + False + + ssh://username:password@example.com/remote/dir/ + False + False + True + True + + + True + True + 1 - - - False - False - 0 - - - - - True - 12 - + True + False + end - - Logarithmic + + Connect... True True - False - True - 0 - True - purgeradiobutton - + True + False + False @@ -3056,66 +3627,52 @@ False False - 0 - - - - - True - <small>Keep progressively less backups into the past: -Keep all backups from yesterday -Keep one backup per day from last week -Keep one backup per week from last month -Keep one backup per month from last year -Keep one backup per quarter from 2nd last year -Keep one backup per year further into past</small> - True - True - - - False - False - 1 + 2 - - False - False - 1 - + + True + True + 1 + + False + True 1 False - False + True 0 - + True + False 12 - + False + False - + Help False True True True - Show help topic about purging of backups. + Show help topic about configuration GUI. + False none - ghelp:sbackup#purge + ghelp:sbackup#config-gtk False @@ -3127,16 +3684,20 @@ False + False 0 - - True + + False 6 - - gtk-dialog-info + + True + False + True + gtk-dialog-error 1 @@ -3146,10 +3707,13 @@ - + + True + False + True 5 5 - <small>Note: Additionally all incomplete and irrecoverable backups will be erased as long as there is a complete backup snapshot made later on.</small> + <i>The selected destination is not writeable with current permissions. Backups cannot be stored there.</i> True center True @@ -3162,6 +3726,7 @@ + True False 1 @@ -3169,1200 +3734,1278 @@ False + True end 1 - 5 + 3 - + True - Purging - - Cleaning old backups - + False + Destination - 5 + 3 False tab - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False 12 - 12 - + True - 3 + False + 3 + 3 + 6 + 18 - + + _No scheduled backups True - 0 - <b>Logging</b> - True + True + False + False + True + True + True + rdbtn_simple_schedule + - 0 + 3 + - + + _Simple True - 12 - - - True - 12 - - - True - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK - cursor - True - Debug is just for debbuging purpose.Info is the recommended setting - 0 - Log level - - - False - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - Debug is just for debbuging purpose. Info is the recommended setting. - Debug -Info -Warning -Error - - - - end - 1 - - - - - 0 - - - - - True - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Log file directory - - - False - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - select-folder - - - - end - 1 - - - - - 1 - - - - + True + False + True + This option will make a backup not at a precise time but when the computer is up. + False + True + 1 + True + + + + 1 + 2 + + + + + + _Custom + True + True + False + False + True + True + rdbtn_simple_schedule + + + + 2 + 3 + + + + + + True + False + 1 + 4 + Do backups + right + True + + + 1 + 2 + 1 + 2 + + + + + + True + False + 1 + 4 + Cron time definition + True + + + 1 + 2 + 2 + 3 + + + + + + True + False + True + + 10 + 0 4 * * * + False + False + True + True + - 1 + 2 + 3 + 2 + 3 + + + + + + True + False + 1 + 0 + 1 + on + hourly +daily +weekly +monthly + + + + 2 + 3 + 1 + 2 + False + True 0 - + True - 3 + False + 12 - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Report by mail</b> - True + + False + False + + + Help + False + True + True + Show help topic about scheduled backups. + False + none + ghelp:sbackup#schedule + + + False + False + end + 0 + + False - False + True 0 - + True - 12 + False + 6 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 4 - 6 - 6 - - - True - 0 - From - - - GTK_FILL - GTK_FILL - - - - - True - 0 - SMTP server - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Port - - - 2 - 3 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - To - - - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - 1 - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - 3 - 4 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - 19 - - - - 1 - 2 - 1 - 2 - - - - - True - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - 4 - - - - False - 0 - - - - - 3 - 4 - 1 - 2 - - - - - False - 0 - - + False + gtk-dialog-info + 1 + + + False + False + 0 + + + + + True + False + 5 + 5 + <small>You can configure scheduled (i.e. automated) backups either simply by choosing an interval or precisely by a custom cron definition. See "man 5 crontab" for cron time definition format.</small> + True + center + True + + + False + False + 1 + + + + + True + False + 1 + + + + + False + True + end + 1 + + + + + 4 + + + + + True + False + Schedule + + + 4 + False + tab + + + + + True + False + 12 + + + True + False + 6 + + + Enable purging of old backups + True + True + False + False + True + True + + + + False + False + 0 + + + + + True + False + 18 + + + True + False + 18 - + True + False + 6 - - Use a username and password + + Simple cut-off: Erase all backups older than True True False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + True True - + False + False 0 - + True - 18 - - - True - False - 12 - - - True - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Username - - - False - 0 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - 1 - - - - - 0 - - - - - True - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Password - - - False - 0 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - - - 1 - - - - - 1 - - - - + True + + 5 + 30 + False + False + True + True + False + True 1 - - - False - 1 - - - - - True - - Use secure connection + True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - + False + days False - 0 + False + 2 + + + False + False + 0 + + + + + True + False + 12 - - True - 18 - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 4 - 6 - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - Choose a certificate file - - - - 3 - 4 - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Key - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Certificate - - - 2 - 3 - GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - Choose a key file - - - - 3 - 4 - 1 - 2 - - - - - - SSL - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - TLSradiobutton - - - 1 - 2 - - - 6 - - - - - TLS - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - True - - - - - - - - - - - - + + True + False + + + Logarithmic + True + True + False + False + True + 0 + True + purgeradiobutton + + + False + False + 0 + False False - 1 + 0 - - - False - False - 2 - - - - - True - start - - Test _mail settings + True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - + False + <small>Keep progressively less backups into the past: +Keep all backups from yesterday +Keep one backup per day from last week +Keep one backup per week from last month +Keep one backup per month from last year +Keep one backup per quarter from 2nd last year +Keep one backup per year further into past</small> + True + True False False - 0 + 1 - 3 + False + False + 1 + True + True 1 False - 1 - - - - - 6 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Report - - - 6 - False - tab - - - - - 1 - - - - - - - True - True - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 4 - True - True - - - 1 - True - True - end - - - - - 6 - Warning - True - center-on-parent - True - dialog - False - - - True - - - True - 6 - 12 - - - True - gtk-dialog-warning - 6 - - - False - False - 0 - - - - - True - - - True - 0 - Content here - True - - - 0 - - - - - True - - - Help - True - True - True - Show help topic about default values. - none - ghelp:sbackup#defaults - - - False False 0 + + + True + False + 12 + + + False + False + + + Help + False + True + True + True + Show help topic about purging of backups. + False + none + ghelp:sbackup#purge + + + False + False + end + 0 + + + + + False + True + 0 + + + + + True + False + 6 + + + False + gtk-dialog-info + 1 + + + False + False + 0 + + + + + False + 5 + 5 + <small>Note: Additionally all incomplete and irrecoverable backups will be erased as long as there is a complete backup snapshot made later on.</small> + True + center + True + + + False + False + 1 + + + + + True + False + 1 + + + + + False + True + end + 1 + + - False - False - 1 - - - - - 1 - - - - - 0 - - - - - True - end - - - _Set - -10 - True - True - True - True - - - False - False - 0 - - - - - gtk-cancel - -6 - True - True - True - True - True - True - - - False - False - 1 - - - - - False - end - 1 - - - - - - - 6 - Set remote target - True - True - dialog - False - False - - - True - 2 - - - True - 6 - 12 - - - True - 6 - - - True - Type of service - - - False - False - 0 + 5 - + True - 0 - + False + Purging + + Cleaning old backups + - 1 + 5 + False + tab - - - False - 0 - - - - - True - 12 - + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 12 - + True - 6 + False + 3 - + True + False 0 - Hostname + <b>Logging</b> + True - False + True + True 0 - + True - True - + False + 12 + + + True + False + 12 + + + True + False + 6 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK + cursor + True + Debug is just for debbuging purpose.Info is the recommended setting + 0 + Log level + + + False + True + 0 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Debug is just for debbuging purpose. Info is the recommended setting. + Debug +Info +Warning +Error + + + + True + True + end + 1 + + + + + True + True + 0 + + + + + True + False + 6 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Log file directory + + + False + True + 0 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + select-folder + + + + True + True + end + 1 + + + + + True + True + 1 + + + + + True + True 1 + False + True 0 - + True - 6 + False + 3 - + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - <b>Details</b> + <b>Report by mail</b> True + False + False 0 - + True - 6 + False + 12 - + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 - + True - 4 - 2 + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 4 6 6 - + + True + False + 0 + From + + + GTK_FILL + GTK_FILL + + + + + True + False + 0 + SMTP server + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Port + + + 2 + 3 + 1 + 2 + GTK_FILL + GTK_FILL + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Port + To + 2 + 3 GTK_FILL + GTK_FILL - + True - 0 - Path + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + False + False + True + True + - 1 - 2 - GTK_FILL + 1 + 2 - + True - 0 - Username + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + False + False + True + True + - 2 - 3 - GTK_FILL + 3 + 4 - + True True - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + 19 + False + False + True + True + 1 2 + 1 + 2 - + True - True - + False + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + 4 + False + False + True + True + + + + False + True + 0 + + - 1 - 2 + 3 + 4 1 2 + + + False + True + 0 + + + + + True + False - + + Use a username and password True True - + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + - 1 - 2 - 2 - 3 + False + True + 0 - + True - 0 - Password + False + 18 + + + True + False + False + 12 + + + True + False + 6 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Username + + + False + True + 0 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + False + False + True + True + + + + True + True + 1 + + + + + True + True + 0 + + + + + True + False + 6 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Password + + + False + True + 0 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + + False + False + True + True + + + + True + True + 1 + + + + + True + True + 1 + + + + - 3 - 4 - GTK_FILL + False + True + 1 + + + False + True + 1 + + + + + True + False - + + Use secure connection True True - - True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + + + + False + True + 0 + + + + + True + False + 18 + + + True + False + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 4 + 6 + 6 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Choose a certificate file + + + + 3 + 4 + + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Key + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Certificate + + + 2 + 3 + GTK_FILL + + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Choose a key file + + + + 3 + 4 + 1 + 2 + + + + + + SSL + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + TLSradiobutton + + + 1 + 2 + + + 6 + + + + + TLS + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + True + + + + + + + + + + + + + + - 1 - 2 - 3 - 4 + False + False + 1 - 0 + False + False + 2 - + True - 6 + False + start - - Show password + + Test _mail settings True True - False - True - + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + + + False + False + 0 + - 1 + True + True + 3 + True + True 1 + False + True 1 - - - - 1 - - - - - 1 - - - - - True - end - - - gtk-cancel - -6 - True - True - True - True - True - True - - - False - False - 0 - - - - - _Connect - -10 - True - True - True - True - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - - 6 - True - center-on-parent - True - dialog - False - - - True - - - True - 6 - 12 - - - True - gtk-dialog-question - 6 - - - False - False - 0 - - - - - True - 6 - - - True - 0 - <b>Create a backup now?</b> - -Initiates a backup process in the background. Each of the enabled profiles are executed. You can force the creation of a full snapshot by enabling the option below. - -Do want to create a backup now? - True - True - - 0 + 6 - + True - - - Make a full backup - True - True - False - True - - - False - 0 - - + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Report - False - False - 1 + 6 + False + tab + True + True 1 - - 0 - - - - - True - end - - - gtk-yes - -10 - True - True - True - True - True - - - False - False - 0 - - - - - gtk-no - -6 - True - True - True - True - True - True - - - False - False - 1 - - - - - False - end - 1 - + + True + True + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 4 + True + True + + + 1 + True + True + end + diff -Nru sbackup-0.11.4/data/ui/sbackup-legacy-restore.glade sbackup-0.11.6/data/ui/sbackup-legacy-restore.glade --- sbackup-0.11.4/data/ui/sbackup-legacy-restore.glade 1970-01-01 01:00:00.000000000 +0100 +++ sbackup-0.11.6/data/ui/sbackup-legacy-restore.glade 2013-09-17 20:49:58.000000000 +0200 @@ -0,0 +1,478 @@ + + + + + + True + Restore files/directories + GTK_WIN_POS_CENTER + 350 + 300 + gtk-preferences + GDK_GRAVITY_CENTER + + + + True + + + True + 12 + + + True + 0 + <b>Restore Source Folder</b> + True + + + False + False + + + + + False + False + + + + + True + 12 + 4 + 3 + 12 + + + + + + + + + + + + + + + True + 0 + + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + + + + 2 + 3 + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + Available backups: + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + + True + + + True + False + True + Type in this box text like that: + +/home/user/folder - To use a local folder +ssh://user:password@machine:/remote/folder - To use a ssh location +ftp://user:password@machine:/remote/folder - To use a ftp location + + + + + True + False + True + False + 0 + + + + True + gtk-open + + + + + False + False + 1 + + + + + True + False + True + gtk-apply + True + 0 + + + + False + False + 2 + + + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + True + 0 + + + + 1 + 2 + GTK_FILL + + + + + + True + True + Use custom: + True + 0 + True + True + radiobutton1 + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + True + Use default: + True + 0 + True + True + + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + + + + 2 + 3 + GTK_FILL + + + + + + False + 1 + + + + + True + 12 + + + True + 0 + <b>Files and Folders to restore</b> + True + + + False + False + + + + + False + False + 2 + + + + + True + + + True + + + + False + False + + + + + 200 + 250 + True + True + GTK_SHADOW_IN + + + True + True + False + False + + + + + + + + + + 1 + + + + + True + + + + False + False + 2 + + + + + 3 + + + + + True + 12 + GTK_BUTTONBOX_END + + + True + False + True + True + 0 + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-revert-to-saved + + + False + False + + + + + True + Restore + True + + + False + False + 1 + + + + + + + + + + + True + False + True + True + 0 + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-floppy + + + False + False + + + + + True + Restore As... + True + + + False + False + 1 + + + + + + + + + 1 + + + + + True + True + True + gtk-close + True + 0 + + + + 2 + + + + + False + False + 4 + + + + + + + 5 + True + GTK_WIN_POS_CENTER_ON_PARENT + True + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + True + 2 + + + True + True + 0.01 + Restoring, this might take some time ... + + + 1 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + 0 + + + + + + False + GTK_PACK_END + + + + + + diff -Nru sbackup-0.11.4/data/ui/sbackup-restore.glade sbackup-0.11.6/data/ui/sbackup-restore.glade --- sbackup-0.11.4/data/ui/sbackup-restore.glade 2011-02-13 18:22:28.000000000 +0100 +++ sbackup-0.11.6/data/ui/sbackup-restore.glade 2013-09-17 20:49:58.000000000 +0200 @@ -463,86 +463,6 @@ - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Upgrade snapshot - True - - - 0 - - - - - True - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0.47999998927116394 - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-sort-ascending - - - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Upgrade - - - False - 1 - - - - - - - - - False - False - 0 - - - - - False - 1 - - - - - False - 1 - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff -Nru sbackup-0.11.4/debian/changelog sbackup-0.11.6/debian/changelog --- sbackup-0.11.4/debian/changelog 2013-05-28 17:06:54.000000000 +0200 +++ sbackup-0.11.6/debian/changelog 2014-02-26 22:26:10.000000000 +0100 @@ -1,3 +1,70 @@ +sbackup (0.11.6-0ubuntu1) trusty; urgency=low + + * new upstream version + - XFCE4 added to list of supported desktop environments to enable + status indicator on xfce4 + - fix for bug 632605 merged. Thanks to Mascha + - added french desktop entry + * debian/rules + - targets build-arch and build-indep added + * debian/control + - increased min debhelper to 9. + - increased Standards-Version to 3.9.4. + * debian/compat + - increased to latest version + * [Fix] LP: #1174124 Catch invalid path selections to avoid TypeErrors + when coercing to Unicode + * [Fix] LP: #1159705 set default setting for log level as string. + * [Fix] LP: #1190224 Restore behaviour of GioOperations.path_exists. + * [Fix] LP: #632605. Thanks to Mascha + + -- Jean-Peer Lorenz Mon, 24 Feb 2014 19:11:41 +0100 + +sbackup (0.11.5-0ubuntu1) trusty; urgency=low + + * new upstream version + - patch from Oneiric (thanks Simon Déziel) applied to make the temp + directory RWX only by owner instead of by all. (LP: #785495) + - remove 'backup upgrade' feature and 'rebase snapshot' feature since + it is not reliable and can cause severe user data loss + - added exception handling in case of not implemented + 'attach_to_status_icon' method (e.g. Debian Wheezy) + * drop patch ubuntu-changes-0.11.4-0ubuntu3, it is merged now + * debian/*.install + - file sbackup-legacy-restore added + - file sbackup-upgrade-backups removed + * [Fix] LP: #1000171 make it backwards compatible because upgrade-backups + is incredibly slow and not reliable: + * [Fix] LP: #1097465 Regular expressions defined in default configuration + can be improved: + * [Fix] LP: #785512 Backup files are not protect from local user access: + make the snapshot directories RWX only by owner + (existing snapshots are not affected by this fix). + * [Fix] LP: #330680 fails if target path contains #. + * [Fix] LP: #980786 Don't complain about non-accessable excluded files. + * [Fix] LP: #670646 sbackup-gtk crashes while starting: invalid literal + for int(). + * [Fix] LP: #888367 TypeError: argument of type 'int' is not iterable: + Try to fix type error by not using interpolation when + getting items From ConfigParser. + * [Fix] LP: #173490 Pre/Post backup script hooks: + applied patch suggested by Derek Ditch + * [Fix] LP: #918099 System menu names should include 'admin' or similar: + applied patch suggested by Anton (feenstra) + * [Fix] LP: #875634 sbackup's tar very slow due to erroneous backup size + calculation: + Sometimes the calculation of the space required goes + badly wrong and we could end-up With _checkp=1 for + 30GB to save, making tar VERY slow. + Fixed by setting minimum value to 100. Thanks to + Thibault Godouet for the patch. + * [Fix] LP: #768080 incremental snapshots store more files than needed: + add TAR option '--no-check-device'. Thanks to + Rogach (platon7pronko) and Felix Griewald (tiiunder) + for the patch. + + -- Jean-Peer Lorenz Mon, 21 Jan 2013 20:07:30 +0100 + sbackup (0.11.4-0ubuntu5) saucy; urgency=low * Depend on the new package name: fuse-utils is renamed to fuse. diff -Nru sbackup-0.11.4/debian/compat sbackup-0.11.6/debian/compat --- sbackup-0.11.4/debian/compat 2011-06-17 12:15:54.000000000 +0200 +++ sbackup-0.11.6/debian/compat 2014-02-26 22:26:10.000000000 +0100 @@ -1 +1 @@ -7 +9 diff -Nru sbackup-0.11.4/debian/control sbackup-0.11.6/debian/control --- sbackup-0.11.4/debian/control 2013-05-28 17:07:00.000000000 +0200 +++ sbackup-0.11.6/debian/control 2014-02-26 22:26:10.000000000 +0100 @@ -4,8 +4,8 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Simple Backup Maintainers Uploaders: Jean-Peer Lorenz , Ouattara Oumar Aziz -Build-Depends: debhelper (>= 7.0.50), python (>= 2.6.6-3~) -Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~) +Standards-Version: 3.9.5 X-Python-Version: >= 2.6 Package: sbackup diff -Nru sbackup-0.11.4/debian/copyright sbackup-0.11.6/debian/copyright --- sbackup-0.11.4/debian/copyright 2011-06-17 12:15:54.000000000 +0200 +++ sbackup-0.11.6/debian/copyright 2014-02-26 22:26:10.000000000 +0100 @@ -1,11 +1,11 @@ -This package was debianized by Jean-Peer Lorenz Tue, 08 Feb 2011 13:58:43 +0100 +This package was debianized by Jean-Peer Lorenz Mon, 24 Feb 2014 19:11:41 +0100 It was downloaded from: https://launchpad.net/sbackup/ Upstream Authors: Jean-Peer Lorenz Ouattara Oumar Aziz -Copyright: copyright (c) 2008-2011 by Jean-Peer Lorenz +Copyright: copyright (c) 2008-2013 by Jean-Peer Lorenz copyright (c) 2007-2010 by Ouattara Oumar Aziz copyright (c) 2005-2007 by Aigars Mahinovs @@ -28,6 +28,6 @@ On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. -The Debian packaging is (C) 2009-2011, Jean-Peer Lorenz , +The Debian packaging is (C) 2009-2011,2014, Jean-Peer Lorenz , (C) 2008-2010, Ouattara Oumar Aziz , (C) 2005-2007 Aigars Mahinovs and is licensed under the GPL, see above. diff -Nru sbackup-0.11.4/debian/patches/series sbackup-0.11.6/debian/patches/series --- sbackup-0.11.4/debian/patches/series 2011-07-20 19:36:31.000000000 +0200 +++ sbackup-0.11.6/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ubuntu-changes-0.11.4-0ubuntu3 diff -Nru sbackup-0.11.4/debian/patches/ubuntu-changes-0.11.4-0ubuntu3 sbackup-0.11.6/debian/patches/ubuntu-changes-0.11.4-0ubuntu3 --- sbackup-0.11.4/debian/patches/ubuntu-changes-0.11.4-0ubuntu3 2011-07-20 19:38:59.000000000 +0200 +++ sbackup-0.11.6/debian/patches/ubuntu-changes-0.11.4-0ubuntu3 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -Description: Make the temporary directory RWX only by owner -Author: Simon Deziel -Reviewed-By: Daniel T Chen -Origin: Simon Deziel, https://launchpadlibrarian.net/72060904/sbackup_0.11.4-0ubuntu3.debdiff -Bug-Ubuntu: https://bugs.launchpad.net/bugs/785495 -Last-Update: 2011-07-20 - ---- sbackup-0.11.4.orig/src/sbackup/core/ConfigManager.py -+++ sbackup-0.11.4/src/sbackup/core/ConfigManager.py -@@ -1333,6 +1333,9 @@ class ConfigurationFileHandler(object): - if not os.path.exists(tempdir) : - os.mkdir(tempdir) - -+ if (os.stat(tempdir).st_mode & 0777) != 0700: -+ os.chmod(tempdir,0700) -+ - return tempdir - - def get_profilename(self, conffile): diff -Nru sbackup-0.11.4/debian/rules sbackup-0.11.6/debian/rules --- sbackup-0.11.4/debian/rules 2011-06-17 12:15:54.000000000 +0200 +++ sbackup-0.11.6/debian/rules 2014-02-26 22:26:10.000000000 +0100 @@ -21,7 +21,9 @@ $(MAKE) clean dh_clean -build: build-stamp +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp build-stamp: dh_testdir $(MAKE) PREFIX=/usr diff -Nru sbackup-0.11.4/debian/sbackup-gtk.install sbackup-0.11.6/debian/sbackup-gtk.install --- sbackup-0.11.4/debian/sbackup-gtk.install 2011-06-17 12:15:54.000000000 +0200 +++ sbackup-0.11.6/debian/sbackup-gtk.install 2014-02-26 22:26:10.000000000 +0100 @@ -11,5 +11,7 @@ usr/share/icons/ubuntu-mono-dark/apps/24/*.png usr/share/sbackup/sbackup-config-gtk usr/share/sbackup/sbackup-restore-gtk +usr/share/sbackup/sbackup-legacy-restore usr/bin/sbackup-restore-gtk +usr/bin/sbackup-legacy-restore usr/bin/sbackup-config-gtk diff -Nru sbackup-0.11.4/debian/sbackup.install sbackup-0.11.6/debian/sbackup.install --- sbackup-0.11.4/debian/sbackup.install 2011-06-17 12:15:54.000000000 +0200 +++ sbackup-0.11.6/debian/sbackup.install 2014-02-26 22:26:10.000000000 +0100 @@ -6,7 +6,6 @@ usr/share/sbackup/sbackup/fs_backend/*.py usr/share/sbackup/sbackup/util/*.py usr/share/sbackup/sbackup-run -usr/share/sbackup/sbackup-upgrade-backups usr/share/sbackup/sbackupconfig.py usr/share/sbackup/multipleTarScript usr/share/sbackup/sbackup-launch @@ -16,7 +15,6 @@ usr/share/locale usr/share/gnome/help/sbackup usr/sbin/sbackupconfig -usr/bin/sbackup-upgrade-backups usr/bin/sbackup usr/share/gconf/schemas/apps_sbackup_global-preferences.schemas etc/dbus-1/system.d/org.sbackupteam.SimpleBackup.conf diff -Nru sbackup-0.11.4/HACKING sbackup-0.11.6/HACKING --- sbackup-0.11.4/HACKING 2011-02-13 18:22:24.000000000 +0100 +++ sbackup-0.11.6/HACKING 2013-09-17 20:49:59.000000000 +0200 @@ -14,6 +14,12 @@ Pydev Pylint - checks the code style, imports, unused variables etc. +Commit messages should have the same format as changelog entries + * [FIX] LP Bug #577296: Crash, a number is required, not str + * [Fix] regression: avoid backup of circular symlinks + * [Fix]: implemented a work-around to enable notifications + * [Change]: Logarithmic purge disabled since it still has issues + * [Enhancement]: improvements to the release script Summary of style guide ---------------------- @@ -30,6 +36,14 @@ within classes by a single line +Branches and versions +===================== + +Development takes place in the trunk version. At a certain point in time, a +version branch is forked and a release is prepared. Fixes and modifications +made to a specific branch are then re-merged into the trunk. + + How to run from source code --------------------------- @@ -40,8 +54,112 @@ that case, it might occur name conflicts: in your development environment and in the Python site-packages directory. -If you know what you are doing you can run development code for testing -as follows: +ALTERNATIVE A - recommended +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Use helper scripts shipped with sbackup (based on fresh wheezy installation) + +0. Install bazaar and set your Launchpad ID + + ~$ sudo apt-get install bzr + You have not informed bzr of your Launchpad ID, and you must do this to + write to Launchpad or access private data. See "bzr help launchpad-login". + -> inform bzr of ID + + install bzrtools and bzr-gtk (if you want to) + see: bzr help gtk + + + bzr whoami "Firstname Lastname " + bzr launchpad-login + + see: https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair + add ssh key (or copy .ssh from another machine) + + + +1. create a directory for your local branch + + ~$ mkdir Dokumente/sbackup + ~$ cd Dokumente/sbackup + + +2. checkout branch + + ~/Dokumente/sbackup$ bzr branch lp:sbackup/0.11 + Branched 244 revisions. + ~/Dokumente/sbackup$ cd 0.11/ + ~/Dokumente/sbackup/0.11$ ls + AUTHORS COPYING debian HACKING INSTALL METAINFO nssbackup.ChangeLog README setup.py.in tests tools + ChangeLog data doc help Makefile NEWS po scripts src TODO + + ~/Dokumente/sbackup/0.11$ bzr log -r-2.. + + ------------------------------------------------------------ + revno: 244 + committer: Jean-Peer Lorenz + branch nick: 0.11 + timestamp: Thu 2012-01-05 18:03:14 +0100 + message: + * updated changelog + ------------------------------------------------------------ + revno: 243 + committer: Jean-Peer Lorenz + branch nick: 0.11 + timestamp: Thu 2012-01-05 18:02:50 +0100 + message: + * [Fix] LP: #768080 incremental snapshots store more files than needed: + add TAR option '--no-check-device'. Thanks to Rogach (platon7pronko) and + Felix Griewald (tiiunder) for the patch. + + +3. You have successfully branched sbackup to your local harddrive! + + +4. Before actually running scripts in order to test modifications, please setup +your development environment by means of following script: + + ~/Dokumente/sbackup/0.11$ source tools/setup-dev.sh + =SBACKUP DEVELOPMENT= user@host:~/Dokumente/sbackup/0.11/scripts$ + + +5. You are now in a dedicated environment (note the leading +'=SBACKUP DEVELOPMENT= ' in front of your prompt). It is changed into +the 'script' directory of your branch. + +Execute scripts as you like, +e.g. run a backup with + ./sbackup-run --no-dbus --config-file= + +or full backups with + ./sbackup-run --no-dbus --full --config-file= + +or restore with + ./sbackup-restore --config= + + +6. To finish hacking, just exit the development environment by typing 'exit' + +7. optional: you can also call './tools/teardown-dev.sh' at any time in order +to clean up your branch and remove temporary files and installed language files. + + +8. push changes + bzr bind lp:~nssbackup-dev/sbackup/0.11 in case the checkout was done + before bzr launchpad-login call; be sure your SSH keys are in place + + bzr push + + when getting error "http does not support mkdir()", try: + bzr push --remember bzr+ssh://bazaar.launchpad.net/~nssbackup-dev/sbackup/0.11 + + + +ALTERNATIVE B +~~~~~~~~~~~~~ + +Prepare setup manually. If you know what you are doing you can run development +code for testing as follows: 1. Add your development directory to the Python path. Do this in a shell, so it does not affect the whole system! You can use the following commands: @@ -64,7 +182,17 @@ python sbackup-restore-gtk python sbackup - + +Limitations +~~~~~~~~~~~ + +When running solely from a development environment it is currently not +possible to perform/test any D-Bus related actions including the indicator +application. Reason for this is the missing/not installed policy file +in /etc/dbus-1/system.d. When installing sbackup properly from source or +deb this file will be installed and D-Bus communication is possible. + + Translations ============ @@ -76,3 +204,11 @@ * https://help.launchpad.net/Translations/YourProject/ImportPolicy * https://help.launchpad.net/Translations/YourProject/Exports + +Testing +======= + +Following test must be executed (automated or manually) before publishing +a new version on each target distribution. Use the spreadsheet to document +your efforts and results. + diff -Nru sbackup-0.11.4/INSTALL sbackup-0.11.6/INSTALL --- sbackup-0.11.4/INSTALL 2011-02-13 18:22:24.000000000 +0100 +++ sbackup-0.11.6/INSTALL 2013-09-17 20:50:00.000000000 +0200 @@ -1,37 +1,75 @@ -******************* -Simple Backup Suite -******************* - -Installation from Package (the easy way) -======================================== - -Include PPA -~~~~~~~~~~~ -* If you use Debian or Ubuntu, try apt-get: - * Install the nssbackup team repository - * deb http://ppa.launchpad.net/nssbackup-team/ubuntu intrepid main - * deb http://ppa.launchpad.net/nssbackup-team/ubuntu hardy main - * deb http://ppa.launchpad.net/nssbackup-team/ubuntu gutsy main +*************************** +sbackup Installation notes +*************************** - [Note] See the PPA page for the full list of repository: - https://launchpad.net/~nssbackup-team/+archive/ppa +Installation from binary packages (the easy way) +================================================= +Debian Stable aka Wheezy - from downloaded deb-package +------------------------------------------------------- -Installation -~~~~~~~~~~~~ - * sudo apt-get install sbackup +1. Download binary packages and place in directory of your choice +2. open a terminal, change into above directory and type: + sudo dpkg -i sbackup_0.11.6-0~bpo70+1_all.deb \ + sbackup-gtk_0.11.6-0~bpo70+1_all.deb \ + sbackup-plugins-fuse_0.11.6-0~bpo70+1_all.deb + +sbackup is now installed on your system and you call execute it from +the application menu/overview as usual. When using GNOME-Shell, just +type 'Backup' in the Activities Overview. + +To uninstall sbackup type: +sudo apt-get remove sbackup sbackup-gtk sbackup-plugins-fuse + +This will keep your configuration files + +Or use: +sudo apt-get purge sbackup sbackup-gtk sbackup-plugins-fuse +to remove sbackup and its configurations etc. completely. + + +Ubuntu - install from default repositories or include our PPA +-------------------------------------------------------------- + +If you use Ubuntu you can install sbackup by simply typing + +sudo apt-get install sbackup + +or using the software center. + +This will install version 0.11.4 of sbackup on your computer. + +If you want to use the latest version of sbackup, e.g. in case you are +affected by a bug, install from the sbackup team repository (PPA): + +https://launchpad.net/~nssbackup-team/+archive/ppa + + +1. add this PPA "ppa:nssbackup-team/ppa" to your system's Software Sources as + described here: https://launchpad.net/+help-soyuz/ppa-sources-list.html + +2. pull down the latest list of software from each archive (apt-get update) + +3. install sbackup by simply typing: + sudo apt-get install sbackup + +To uninstall sbackup type: +sudo apt-get remove sbackup sbackup-gtk sbackup-plugins-fuse + +This will keep your configuration files + +Or use: +sudo apt-get purge sbackup sbackup-gtk sbackup-plugins-fuse +to remove sbackup and its configurations etc. completely. -Uninstalling -~~~~~~~~~~~~ -* If installed via apt: 'sudo apt-get remove sbackup' Installation from source code -============================= +============================== Prerequist -~~~~~~~~~~ +----------- python (>=2.5) pygnome pyglade @@ -48,8 +86,9 @@ Installation -~~~~~~~~~~~~ -By default, Simple Backup will be installed under "/usr/local" folder. +------------- + +By default, sbackup will be installed under "/usr/local" folder. * Remove previously installed versions (using make or .deb packages) @@ -65,16 +104,21 @@ sudo apt-get install gconf2 desktop-file-utils * Walk into the same directory as this README file + * Type: - make && sudo make install - sudo sbackupconfig + make && sudo make install + sudo sbackupconfig Uninstalling -~~~~~~~~~~~~ +------------- + * Walk into the source code directory from where the application was installed + * type: - sudo make uninstall && make clean && sudo make purge-user-config + sudo make uninstall && make clean && sudo make purge-user-config + * this will remove installed files as well as user configurations created + * you can now remove the source code folder diff -Nru sbackup-0.11.4/Makefile sbackup-0.11.6/Makefile --- sbackup-0.11.4/Makefile 2011-02-13 18:22:14.000000000 +0100 +++ sbackup-0.11.6/Makefile 2013-09-17 20:49:58.000000000 +0200 @@ -2,7 +2,7 @@ # # Simple Backup - GNU Makefile # -# Copyright (c)2008-2011: Jean-Peer Lorenz +# Copyright (c)2008-2011,2013: Jean-Peer Lorenz # Copyright (c)2007-2010: Ouattara Oumar Aziz # # This program is free software; you can redistribute it and/or modify @@ -113,8 +113,8 @@ chmod +x $(libdir)/sbackup-run chmod +x $(libdir)/sbackup-config-gtk chmod +x $(libdir)/sbackup-restore-gtk - chmod +x $(libdir)/sbackup-upgrade-backups chmod +x $(libdir)/sbackupconfig.py + chmod +x $(libdir)/sbackup-legacy-restore # application's binaries install-bin: @@ -122,7 +122,7 @@ ln -sf ../share/sbackup/sbackup-run $(bindir)/sbackup ln -sf ../share/sbackup/sbackup-config-gtk $(bindir)/sbackup-config-gtk ln -sf ../share/sbackup/sbackup-restore-gtk $(bindir)/sbackup-restore-gtk - ln -sf ../share/sbackup/sbackup-upgrade-backups $(bindir)/sbackup-upgrade-backups + ln -sf ../share/sbackup/sbackup-legacy-restore $(bindir)/sbackup-legacy-restore ln -sf ../share/sbackup/sbackupconfig.py $(sbindir)/sbackupconfig # python package @@ -182,7 +182,7 @@ rm -f $(bindir)/sbackup rm -f $(bindir)/sbackup-config-gtk rm -f $(bindir)/sbackup-restore-gtk - rm -f $(bindir)/sbackup-upgrade-backups + rm -f $(bindir)/sbackup-legacy-restore rm -f $(sbindir)/sbackupconfig uninstall-package: diff -Nru sbackup-0.11.4/METAINFO sbackup-0.11.6/METAINFO --- sbackup-0.11.4/METAINFO 2011-02-13 18:22:21.000000000 +0100 +++ sbackup-0.11.6/METAINFO 2013-09-17 20:49:58.000000000 +0200 @@ -8,5 +8,5 @@ # Attention: # Use exactly the prescribed format. Additional spaces are not allowed. # -VERSION=0.11.4 +VERSION=0.11.6 PKGNAME=sbackup diff -Nru sbackup-0.11.4/NEWS sbackup-0.11.6/NEWS --- sbackup-0.11.4/NEWS 2011-02-13 18:22:24.000000000 +0100 +++ sbackup-0.11.6/NEWS 2013-09-17 20:49:58.000000000 +0200 @@ -0,0 +1,46 @@ +sbackup NEWS - User visible changes. +Please report bugs at https://bugs.launchpad.net/sbackup + +sbackup (0.11.6), 2013-07-14 + +* bug fixes + +* Replace FileChooserButton with text entry to avoid problems when selecting + destination paths. This issue is related to GTK, for reference see: + http://askubuntu.com/questions/159413/gtkfilechooserbutton-select-folder-mode-returns-no-path + + +sbackup (0.11.5), 2013-01-21 + +* bug fixes + +* remove 'backup upgrade' feature and 'rebase snapshot' feature since it + is not reliable and can cause severe user data loss and added restore + utility which provides legacy support using the 0.10.5 algorithm. + Command must be executed from terminal: + 'sbackup-legacy-restore BACKUP_PATH FILE_OR_DIR_TO_RESTORE [TARGET_DIR]' + or for more ease of use with GTK gui: + 'sbackup-legacy-restore --gui'. + +* Pre/Post backup script hooks: + I've applied patch suggested by Derek Ditch and added this feature to + sbackup series 0.11 (sorry for the delay...) + + It is completely optional. To use it, please add following options to your configuration file: + ... + [hooks] + pre-backup = + post-backup = + ... + You only need to specify scripts that should run, just leave it out if not + required! Please note, the script must be executable (chmod +x) and will be + run with same privileges as your backup process. So, be careful! + +* improved regular expressions defined in default configuration + -do not exclude specific types of files e.g. mp3, avi + -fix regex for .gvfs, trash, cache etc. so these apply + to 'top-level' directories + -add a default regex for lock directories + (e.g. $HOME/.mozilla/lock) + -add a default regex for $HOME/.cache directory + diff -Nru sbackup-0.11.4/po/ar.po sbackup-0.11.6/po/ar.po --- sbackup-0.11.4/po/ar.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/ar.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:24+0000\n" "Last-Translator: Oumar Aziz OUATTARA \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:46+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,53 +42,53 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -104,131 +104,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -338,65 +338,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "" @@ -412,328 +412,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Cancelling pull of snapshot '%s'" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -745,18 +676,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -768,65 +699,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -916,8 +851,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1212,126 +1146,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1340,77 +1268,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1439,7 +1367,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1447,12 +1375,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1528,11 +1456,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1558,58 +1486,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1618,22 +1494,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1642,35 +1518,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1678,21 +1554,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1701,21 +1577,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1723,21 +1599,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1768,67 +1644,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2359,6 +2230,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2411,68 +2331,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/bg.po sbackup-0.11.6/po/bg.po --- sbackup-0.11.4/po/bg.po 2011-02-13 18:22:17.000000000 +0100 +++ sbackup-0.11.6/po/bg.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:29+0000\n" "Last-Translator: Svetoslav Stefanov \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:46+0000\n" +"X-Generator: Launchpad (build 16412)\n" "X-Poedit-Country: BULGARIA\n" "X-Poedit-Language: Bulgarian\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -29,7 +29,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -44,53 +44,53 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -106,131 +106,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "Включени" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "Папка" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -341,65 +341,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Профил по подразбиране" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Непознат профил" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "Неограничено" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Потребителски" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Музика MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "Видео AVI" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "Видео MPEG" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Видео Matrjoshka" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "Мултимедиен контейнер OGG" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Изображения на CD" @@ -415,295 +415,226 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "Не е открит моментния архив %s' " -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Unable to remove upgrade stamp: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "Надграждане от в1.0 към в1.2: %s" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "Надграждане към в1.3: %s" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "Надграждане към в1.4: %s" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "Надграждане към в1.5: %s" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "Името на моментния архив '%s' не съвпада с изискванията" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " @@ -712,33 +643,33 @@ "Предполага се, че форматът за компресиране на моментния архив трябва да е " "'%s', но съответния правилно именуван файл не е открит" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "Невалидно име на моментния архив: %s" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "Невалидно име на база : %s" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -750,18 +681,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -773,65 +704,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -921,8 +856,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1219,126 +1153,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1347,77 +1275,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1446,7 +1374,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1454,12 +1382,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1535,11 +1463,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1565,58 +1493,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "Версията на моментния архив е по-висока от поддържаната!" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1625,22 +1501,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1649,35 +1525,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1685,21 +1561,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1708,21 +1584,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1730,21 +1606,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1775,67 +1651,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2376,6 +2247,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Възстановяване" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2428,227 +2348,78 @@ msgid "Delete" msgstr "Изтриване" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "Надграждане" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "История на моментните архиви" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "Управление на моментните архиви" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Възстановяване" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "Връщане" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "Управление на възстановяването" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "Управление на изнасянето" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" -#~ msgid "Invalid value of the target directory : " -#~ msgstr "Невалидна стойност на целевата папка: " - -#~ msgid "Test Succeeded !" -#~ msgstr "Тестът е успешен!" - -#~ msgid "Target directory is writable." -#~ msgstr "В целевата папка може да се записва." - -#~ msgid "" -#~ "Please change target directory and test writability of the target directory " -#~ "by pressing \"Test\" button on the right." -#~ msgstr "" -#~ "Моля променете целевата папка и проверете дали може да се записва, като " -#~ "натиснете бутона \"Тест\" вдясно." - -#~ msgid "" -#~ "Choose the compression format that you want to apply.\n" -#~ "Default is gzip." -#~ msgstr "" -#~ "Изберете формат за компресиране, който искате да приложите.\n" -#~ "По подразбиране това е gzip." - -#~ msgid "" -#~ "Select the directory in which you have your backups.\n" -#~ "You can use a local or distant directory depending on the " -#~ "plugins you have installed." -#~ msgstr "" -#~ "Изберете папката, която съдържа вашите архиви.\n" -#~ "Можете да използвате локална или отдалечена папка, в " -#~ "зависимост от приставките, които сте инсталирали." - -#~ msgid "Use the default directory : " -#~ msgstr "Използване на папката по подразбиране: " - -#~ msgid "Use a custom directory : " -#~ msgstr "Използване на потребителска папка: " - -#~ msgid "Snapshots directory" -#~ msgstr "Папка за моментните архиви" - -#~ msgid "Restore As" -#~ msgstr "Възстановяване като" - -#~ msgid "Revert As" -#~ msgstr "Връщане като" - -#~ msgid "Choose to upgrade your snapshot if needed." -#~ msgstr "Изберете за да надградите моментния архив при нужда." - -#~ msgid "Actual base :" -#~ msgstr "Актуална база :" - -#~ msgid "I didn't find the log file. Please set it up in sbackup.conf " -#~ msgstr "" -#~ "Не е открит файлът с дневника на действията. Моля настройте го във файла " -#~ "sbackup.conf " - -#~ msgid "Initializing FUSE FILE ACCESS MANAGER !" -#~ msgstr "Инициализиране на FUSE FILE ACCESS MANAGER !" - -#~ msgid "Problem with '%(file)s' : %(error)s " -#~ msgstr "Проблем с '%(file)s' : %(error)s " - -#~ msgid "No directory to backup !" -#~ msgstr "Няма папка, която да бъде архивирана!" - -#~ msgid "'%(file)s' doesn't exist, it has to be exclude " -#~ msgstr "'%(file)s' не съществува и трябва да бъде изключен " - -#~ msgid "" -#~ "We don't have read access to '%(file)s', it has to be exclude : %(error)s " -#~ msgstr "" -#~ "Няма достъп за четене до %(file)s' и той трябва да бъде изключен : %(error)s " - -#~ msgid "" -#~ "'%(file)s' size is higher than the specified one ( %(filesize)s > " -#~ "%(maxsize)s), it has to be exclude " -#~ msgstr "" -#~ "Размерът на '%(file)s' е по-голям от зададения ( %(filesize)s > %(maxsize)s) " -#~ "и то трябва да бъде изключен " - -#~ msgid "Terminating FUSE FILE ACCESS MANAGER !" -#~ msgstr "Прекратяване на FUSE FILE ACCESS MANAGER !" - -#~ msgid "" -#~ "When setting a username (resp password), password (resp username) is " -#~ "mandatory" -#~ msgstr "" -#~ "Когато задавате потребителско име (респ. парола), паролата (респ. " -#~ "потребителското име) е задължителна" - -#~ msgid "Set the reciever of this mail" -#~ msgstr "Задайте получателя на тази поща" - -#~ msgid "Non existing directory : %s" -#~ msgstr "Несъществуваща папка: %s" - -#~ msgid "Target '%s' directory is excluded" -#~ msgstr "Целевата папка '%s' е изключена" - -#~ msgid "Deleting '%(snp)s' for purge !" -#~ msgstr "Изтриване на '%(snp)s' за изчистване!" - -#~ msgid "gtk-remove" -#~ msgstr "gtk-remove" - -#~ msgid "gtk-add" -#~ msgstr "gtk-add" - -#~ msgid "gtk-close" -#~ msgstr "gtk-close" - -#~ msgid "gtk-edit" -#~ msgstr "gtk-edit" - -#~ msgid "gtk-ok" -#~ msgstr "gtk-ok" - -#~ msgid "gtk-cancel" -#~ msgstr "gtk-cancel" - -#~ msgid "Time (for admins only)" -#~ msgstr "Време (само за администратори)" - -#~ msgid "Log settings" -#~ msgstr "Настройки на дневника" - -#~ msgid "Parameters" -#~ msgstr "Параметри" - -#~ msgid "Security" -#~ msgstr "Сигурност" +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "Надграждане от в1.0 към в1.2: %s" -#~ msgid "This is a user friendly backup solution for common desktop needs." -#~ msgstr "Това е дружелюбно за потребителя решение за архивиране." +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "Надграждане към в1.3: %s" -#~ msgid "Choose the SSL option (smtptls=1) to be able to use Cert and Key" -#~ msgstr "" -#~ "Изберете настройката SLL (smtptls=1) за да може да използвате удостоверение " -#~ "и ключ" +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "Надграждане към в1.4: %s" -#~ msgid "" -#~ "Please enter the new profile name in the Profile name entry and check " -#~ "the Enable checkbox to enable it." -#~ msgstr "" -#~ "Моля въведете новото име на профил в полето Име на профил и сложете " -#~ "отметка пред Включване." +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "Надграждане към в1.5: %s" -#~ msgid "Test all" -#~ msgstr "Проверка на всичко" +#~ msgid "The version of the snapshot is greater than the supported one!" +#~ msgstr "Версията на моментния архив е по-висока от поддържаната!" -#~ msgid "" -#~ "Debug is just for debbuging purpose\n" -#~ "Info is the recommended setting" -#~ msgstr "" -#~ "Debug е само за проследяване/изчистване на грешки.\n" -#~ "Препоръчителната настройка е Info." +#~ msgid "Upgrade" +#~ msgstr "Надграждане" diff -Nru sbackup-0.11.4/po/ca.po sbackup-0.11.6/po/ca.po --- sbackup-0.11.4/po/ca.po 2011-02-13 18:22:17.000000000 +0100 +++ sbackup-0.11.6/po/ca.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-09-24 23:52+0000\n" "Last-Translator: Siegfried Gevatter \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:46+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,58 +42,59 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Jordi Mallach \n" "\n" "Launchpad Contributions:\n" +" Jordi Mallach https://launchpad.net/~jordi\n" " Siegfried Gevatter https://launchpad.net/~rainct" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 @@ -106,131 +107,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -340,65 +341,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Personalitzat" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Música MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "Vídeo AVI" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "Vídeo MPEG" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Vídeo Matrjoshka" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "Contenidor multimèdia OGG" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Imatges de CD" @@ -414,328 +415,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.3: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -747,18 +679,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -770,65 +702,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -918,8 +854,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1215,126 +1150,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1343,77 +1272,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1442,7 +1371,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1450,12 +1379,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1531,11 +1460,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1561,58 +1490,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1621,22 +1498,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1645,35 +1522,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1681,21 +1558,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1704,21 +1581,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1726,21 +1603,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1771,67 +1648,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2365,6 +2237,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Restaura fitxers/directoris" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Còpies de seguretat disponibles:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Utilitza personalitzat:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Utilitza el predeterminat:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Arxius i Directoris a restaurar" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Restaura" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Anomena i restaura..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2417,71 +2338,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Restaura" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "Revertir" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" - -#~ msgid "Parameters" -#~ msgstr "Paràmetres" diff -Nru sbackup-0.11.4/po/cs.po sbackup-0.11.6/po/cs.po --- sbackup-0.11.4/po/cs.po 2011-02-13 18:22:15.000000000 +0100 +++ sbackup-0.11.6/po/cs.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" -"PO-Revision-Date: 2010-10-05 13:59+0000\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" +"PO-Revision-Date: 2011-02-06 11:42+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:46+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "Není určen logovací soubor." @@ -45,27 +45,27 @@ "\n" "Pokračuje se zpracováním zbývajících profilů." -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "Záloha byla zrušena uživatelem." -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "Nastala chyba při rušení zálohy:" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "Během zálohování došlo k chybě:" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "Chyba při odesílání e-mailu:" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" @@ -74,7 +74,7 @@ "Zálohování není spuštěno..\n" "%s" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " @@ -84,25 +84,29 @@ "chyby v programu, překladu nebo čemkoliv jiném, navštivte naši webovou " "stránku." -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "Správci:" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "Dřívější správci:" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "Přispěli:" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" +" David Kovar https://launchpad.net/~kowy\n" " Jan Hrdina https://launchpad.net/~jan-hrdina\n" " Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" -" Kabi https://launchpad.net/~kubat-jan" +" Kabi https://launchpad.net/~kubat-jan\n" +" Michal Jaros https://launchpad.net/~klaksunek\n" +" Petr Ferschmann https://launchpad.net/~petr-ferschmann\n" +" Vladimír Burian https://launchpad.net/~vburian" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -114,132 +118,132 @@ msgid "Effective path for `%s` is not available" msgstr "Efektivní cesta k `%s` není k dispozici" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "Nelze získat efektivní cestu pro `%s`" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" "V současné době není rozdělovací metoda kompatibilní s možností komprese." -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "Nelze změnit oprávnění pro soubor '%s'." -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "Nelze odstranit dočasný soubor `%(file)s`: %(error)s" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "Adresář" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "Soubor '%s' neexistuje." -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "Adresář neexistuje: %s." @@ -353,65 +357,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Výchozí profil" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Neznámý profil" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "Bez omezení" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "100 MiB" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "250 MiB" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "650 MiB" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "2 GiB (FAT16)" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "4 GiB (FAT32)" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Vlastní" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Hudba MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "Video AVI" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "Video MPEG" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Video Matroska" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "Multimediální kontejner OGG" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Obrazy CD" @@ -427,221 +431,152 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "Příprava procesu zálohování" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "Volba \"Následovat symbolické odkazy\" je povolena." -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "Zálohovací proces ukončen." -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "Počet adresářů: %s." -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "Celkový počet souborů: %s." -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "Počet symbolických odkazů: %s." -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "Počet nových souborů (také zahrnutých): %s." -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "Počet položek vynuceně vyřazených: %s." -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "Počet položek vyřazených konfigurací: %s." -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "Maximální požadované volné místo je '%s'." -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "Dostupné místo na disku je '%s'." -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " @@ -650,107 +585,107 @@ "Nedostatek volného místa v cílovém adresáři pro plánovanou zálohu (volno: " "%(freespace)s, požadováno: %(neededspace)s)." -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "Nelze kopírovat soubor protokolu: %s" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "Zpracování profilu bylo zrušeno na žádost uživatele\n" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "Zpracování profilu úspěšně dokončeno (bez chyb)\n" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "Zpracování profilu se nezdařilo, chyba: %s\n" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "Cíl zálohování: %s" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "Nelze najít cílový adresář." -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "Nepodařilo se najít cílový adresář ani opakovaně." -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "Cílový adresář '%(target)s' neexistuje." -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -762,18 +697,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "SFTP" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "SSH" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "FTP" @@ -785,65 +720,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "NFS" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "SMB" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "Odstranit soubor" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "Odstranit adresář" @@ -935,8 +874,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "chyba Simple Backup" @@ -1272,126 +1210,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "Připojení k démonu notifikace selhalo: %s" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "Simple Backup" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "Zkusit znovu" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "Profil: %s" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "Velikost zálohy: %s" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "Zbývající čas: %s" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1400,77 +1332,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "Jiný `Simple Backup indikátor` už běží." -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1499,7 +1431,7 @@ msgid "Restore..." msgstr "Obnovit..." -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "Obnovit jako..." @@ -1507,12 +1439,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1588,11 +1520,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1618,58 +1550,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1678,22 +1558,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1702,35 +1582,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1738,21 +1618,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1761,21 +1641,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1783,21 +1663,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1828,67 +1708,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "Soubor '%(file)s' neexistuje." - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2453,6 +2328,55 @@ msgid "Make a full backup" msgstr "Provést úplnou zálohu" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Obnovit soubory/adresáře" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Zdrojový adresář pro obnovu" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Dostupné zálohy" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Použít vlastní" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Použít výchozí" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Soubory a adresáře k obnovení" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Obnovit" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Obnovit jako..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2505,68 +2429,76 @@ msgid "Delete" msgstr "Smazat" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Obnovit" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "Vrátit" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "Titulek" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "Obsah" + +#, python-format +#~ msgid "File '%(file)s' does not exist." +#~ msgstr "Soubor '%(file)s' neexistuje." + +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "Aktualizace na v1.3: %s" + +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "Aktualizace z v1.0 na v1.2: %s" + +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "Aktualizace na v1.5: %s" + +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "Aktualizace na v1.4: %s" diff -Nru sbackup-0.11.4/po/da.po sbackup-0.11.6/po/da.po --- sbackup-0.11.4/po/da.po 2011-02-13 18:22:15.000000000 +0100 +++ sbackup-0.11.6/po/da.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 14:02+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:46+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,55 +42,58 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" Mads Lundby https://launchpad.net/~lundbymads-gmail\n" +" Martin Hansen https://launchpad.net/~mh-mail" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -102,131 +105,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -336,65 +339,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Brugerdefineret" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3-musik" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI-video" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG-video" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matrjoshka-video" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "OGG-multimediebeholder" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Cd-aftryk" @@ -410,328 +413,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.3: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -743,18 +677,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -766,65 +700,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -914,8 +852,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1210,126 +1147,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1338,77 +1269,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1437,7 +1368,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1445,12 +1376,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1526,11 +1457,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1556,58 +1487,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1616,22 +1495,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1640,35 +1519,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1676,21 +1555,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1699,21 +1578,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1721,21 +1600,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1766,67 +1645,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2362,6 +2236,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Gendan filer/mapper" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Kildemappe til gendannelse" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Tilgængelige backupper:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Anvend brugerdefineret:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Anvend standard:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Filer og mapper til gendannelse" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Gendan" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Gendan som..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2414,68 +2337,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Gendan" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/de.po sbackup-0.11.6/po/de.po --- sbackup-0.11.4/po/de.po 2011-02-13 18:22:17.000000000 +0100 +++ sbackup-0.11.6/po/de.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" -"PO-Revision-Date: 2011-02-04 23:36+0000\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" +"PO-Revision-Date: 2011-02-06 11:45+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:46+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "SBackup Daemon <%(login)s@%(hostname)s>" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "[SBackup] [%(profile)s] Bericht vom %(date)s" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "Es wurde keine Protokolldatei angegeben." @@ -46,27 +46,27 @@ "\n" "Es wird mit den verbleibenden Profilen fortgefahren." -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "Die Sicherung wurde vom Benutzer abgebrochen." -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "Während des Abbruchs der Sicherung ist ein Fehler aufgetreten:" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "Während der Sicherung trat folgender Fehler auf:" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "Fehler beim Versenden der E-Mail:" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "Die folgenden Fehler sind bisher aufgetreten:" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" @@ -75,7 +75,7 @@ "Sicherung wird nicht ausgeführt.\n" "%s" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " @@ -85,28 +85,38 @@ "Bereich. Falls Du mithelfen möchtest, z.B. durch das Melden von Fehlern, " "Übersetzen der Anwendung usw. besuche unsere Webseite." -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "Betreuer:" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "Ehemalige Betreuer:" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "Mitwirkende:" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Übersetzer\n" "\n" "Launchpad Contributions:\n" +" Achim Richter https://launchpad.net/~marabu\n" +" Andreas Meyer https://launchpad.net/~meyer-greiz\n" " Andreas Tarp https://launchpad.net/~andreas-tarp\n" +" Dirk Salewski https://launchpad.net/~dsalewski-deactivatedaccount\n" " Georg Engelmann https://launchpad.net/~georg-engelmann\n" +" Jacek Zmudzki https://launchpad.net/~jacek-zmudzki\n" " Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" +" Johnny https://launchpad.net/~johnnym1\n" +" Kai Schroeder https://launchpad.net/~kai-schroeder\n" +" Martin Schaaf https://launchpad.net/~mascha\n" " Martin Schröder https://launchpad.net/~martinschroeder\n" +" Matthias Rosenkranz https://launchpad.net/~rose\n" +" Matthäus Brandl https://launchpad.net/~matthaeus\n" +" Steffen Banhardt https://launchpad.net/~steffenbanhardt\n" " toomuch https://launchpad.net/~toomuch" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 @@ -119,63 +129,63 @@ msgid "Effective path for `%s` is not available" msgstr "Effektiver Pfad für `%s` ist nicht verfügbar" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "Kann keinen gültigen Pfad für `%s` finden" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" "Zur Zeit ist das Aufteilen von Sicherungen nicht kompatibel zur " "Komprimierungsfunktion." -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "Zugriffsrechte für Datei '%s' konnten nicht geändert werden." -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "Temporäre Datei `%(file)s` konnte nicht entfernt werden: %(error)s" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "Ausführen von TAR um eine inkrementelle Sicherung zu erstellen." -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" "Die SNAR-Datei zur Erstellung einer inkrementellen Sicherung wurde nicht " "gefunden." -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" "Es wird auf die Erstellung einer vollständigen Sicherung ausgewichen." -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "Ausführen von TAR um eine vollständige Sicherung zu erstellen." -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "Führende '/' wurden von den Pfaden im Archiv entfernt." -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" "Führende '/' wurden von den Zielen harter Verknüpfungen im Archiv entfernt." -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "TAR gab folgende Mitteilung zurück: %s" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" @@ -184,16 +194,16 @@ "TAR gab folgende Mitteilungen zurück:\n" "%s" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "TAR wurde erfolgreich beendet." -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "TAR lieferte eine Warnung: %s" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" @@ -202,60 +212,60 @@ "TAR lieferte Warnungen:\n" "%s" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "TAR gab Warnungen zurück, konnte aber erfolgreich beendet werden." -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" "Sicherung war nicht erfolgreich. TAR wurde aufgrund von Fehlern vorzeitig " "beendet." -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "Der Hintergrund-Prozess konnte nicht beendet werden: %s" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "Aufgenommen" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "Nicht geändert" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "Verzeichnis" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "Zeile muss eine Zeichenkette sein" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "Verzeichnis zum Ablegen ist inkonsistent: 'filename' ist leer" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "Verzeichnis zum Ablegen ist inkonsistent: 'control' ist leer" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "Die Datei '%s' existiert nicht." -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "Kopf der SNAR-Datei ist unvollständig." -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "Eine Sicherungsdatei wird benötigt" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "Das Verzeichnis existiert nicht: %s." @@ -385,65 +395,65 @@ "Wenn ein SSL Zertifikat oder eine Schlüsseldatei festgelegt wurde, ist die " "Angabe einer Schlüsseldatei bzw. eines Zertifikats notwendig." -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Standardprofil" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Unbekanntes Profil" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "Unbegrenzt" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "100 MiB" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "250 MiB" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "650 MiB" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "2 GiB (FAT16)" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "4 GiB (FAT32)" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Benutzerdefiniert" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3-Musik" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI-Videos" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG-Videos" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matroska-Videos" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "OGG-Multimedia-Container" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "CD-Abbilder" @@ -461,66 +471,27 @@ "Datei '%(filename)s' wurde nicht in der Dateiliste der Sicherung " "[%(snapshotname)s] gefunden. Wird übersprungen." -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "Sicherung '%s' wurde nicht gefunden " -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" "Ungültige Sicherung `%(name)s` gefunden: Name der Sicherung ist nicht gültig." -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "Ungültige Sicherung `%(name)s` gefunden: %(error_cause)s." -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" -"Die Datengrundlage einer vollständigen Sicherung '%s' braucht nicht " -"umgestellt werden" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" -"'%(snapshotToRebase)s' enthält keine 'base'-Datei, es ist möglicherweise " -"beschädigt " - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" -"Die Datengrundlage eine Sicherung kann nicht auf eine jüngere Sicherung " -"umgestellt werden: '%(snapshotToRebase)s' <= '%(NewBaseSnapshot)s' " - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "Ändern der Basis von '%(current)s' auf '%(base)s'" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "Während des Lesens der Sicherung '%s' ist ein Fehler aufgetreten." - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "Dateikopf der 'snar'-Datei ist unvollständig!" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "Ausgangssicherung des Sicherung '%s' ist nicht gesetzt." - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." @@ -528,171 +499,130 @@ "Sicherung '%s' ist bereits eine vollständige Sicherung, es gibt nichts zu " "tun (wird nicht in eine volle Sicherung umgewandelt)." -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "Zugriff auf Sicherung '%s' abgebrochen" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "Upgrade-Hinweis konnte nicht entfernt werden: %s" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "Umstellung von v1.0 auf v1.2: %s" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "Umstellung auf v1.3: %s" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "Umstellung auf v1.4: %s" - -#: src/sbackup/core/UpgradeManager.py:246 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.5: %s" -msgstr "Umstellung auf v1.5: %s" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." +msgid "Running of hooks: %s" msgstr "" -"Die SNAR-Datei existiert bereits für die Sicherung '%s'. Sie wird nicht " -"überschrieben." -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "Vorbereitung des Sicherungsvorgangs" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" -"Es gibt Sicherungen die in einem veralteten Sicherungsformat gespeichert " -"wurden. Bitte diese Sicherungen mit Hilfe der Anwendung 'Simple Backup " -"Wiederherstellung' upgraden um sie zu verwenden." - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "Sicherung '%(name)s' wird erstellt." -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "Festlegen der Ausgangssicherung auf '%(value)s'." -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "Erstellen der Paket-Liste." -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "Problem beim Festlegen der Paketliste: " -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "Schreiben der 'Nicht Sichern'-Liste." -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "Komprimierung festgelegt auf `%s`" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "Größe der Teilarchive festgelegt auf %s" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "Option 'Symbolischen Links folgen' ist aktiviert." -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "Option 'Symbolischen Links folgen' ist nicht aktiviert." -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "Sicherung wird geschrieben" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "Fehler während des Entfernens alter Sicherungen: %s" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "Sicherungsvorgang wurde beendet." -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "Untersuchen des Dateisystems und sammeln der Dateiinformationen" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "Zusammenfassung der Sicherung" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "Anzahl von Verzeichnissen: %s." -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "Gesamtanzahl von Dateien: %s." -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "Anzahl symbolischer Verknüpfungen: %s." -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "Anzahl der in diesen Schnappschuss eingeschlossenen Dateien: %s." -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "Anzahl neuer Dateien (ebenfalls eingeschlossen): %s." -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" "Anzahl übersprungener Dateien in diesem inkrementellen Schnappschuss: %s." -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "Anzahl von Elementen, die ausgeschlossen werden mussten: %s." -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" "Anzahl von Elementen, die auf Grund von Benutzereinstellungen ausgeschlossen " "wurden: %s." -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "Maximal benötigter freier Speicherplatz ist '%s'." -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "Verfügbarer Speicherplatz ist '%s'." -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " @@ -701,83 +631,83 @@ "Für die geplante Sicherung ist nicht genügend freier Speicher im " "Zielverzeichnis verfügbar (frei: %(freespace)s, benötigt: %(neededspace)s)." -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" "Protokolldatei konnte nicht kopiert werden. Dateizugriff wurde nicht " "initialisiert." -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "Protokolldatei konnte nicht kopiert werden: %s" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "Logdatei wurde nicht gefunden." -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "Keine Sicherung vorhanden um das Log zu kopieren." -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" "Die Bearbeitung des Sicherungsprofils wurde auf Wunsch des Benutzers " "abgebrochen\n" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" "Die Bearbeitung des Sicherungsprofils wurde erfolgreich beendet (keine " "Fehler)\n" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" "Die Bearbeitung des Sicherungsprofils ist fehlgeschlagen. Fehler: %s\n" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "Sicherungsziel: %s" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "Zielverzeichnis konnte nicht gefunden werden." -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" "Zielverzeichnis konnte auch nach einem weiteren Versuch nicht gefunden " "werden." -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "Zielverzeichnis '%(target)s' existiert nicht." -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "Auf das Zielverzeichnis konnte nicht zugegriffen werden: %s" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "Schnappschuss ist inkonsistent: __name ist nicht festgelegt " -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "Name der Sicherung '%s' erfüllt Anforderung nicht" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "Schnappschuss ist inkonsistent: __snapshotpath ist nicht festgelegt " -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " @@ -786,7 +716,7 @@ "Das Format der Sicherung sollte '%s' sein, jedoch wurde ein entsprechend " "benannte Datei nicht gefunden" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " @@ -795,26 +725,26 @@ "%(file)s enthält keinen gültigen Wert. Unvollständiges oder unbekanntes " "Verzeichnis wird ignoriert. " -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "Name der Sicherung ist ungültig: %s" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "Name der Ausgangssicherung ist ungültig: %s" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "Ungültiger Name der Sicherung: %s" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "Die notwendige Datei `ver` konnte nicht gelesen werden" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" "Für eine inkrementelle Sicherung muss der Name einer Ausgangssicherung " @@ -828,18 +758,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "Beendigung des FUSE File Access Manager." -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "SFTP" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "SSH" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "FTP" @@ -851,68 +781,72 @@ msgid "Terminating GIO File Access Manager." msgstr "Beendigung des GIO Dateizugriffs." -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "NFS" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "SMB" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "Mountpunkt konnte nicht ermittelt werden: Pfad ist nicht eingebunden" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" "Mountpunkt konnte nicht ermittelt werden: Einzubindener Pfad wurde nicht " "gefunden (ist wahrscheinlich lokal)" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "Mountpunkt konnte nicht ermittelt werden: %s" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" "Mountflag konnte nicht zurück gesetzt werden: Pfad wurde nicht gesichert" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "Pfad ist bereits eingebunden." -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "Pfad ist nicht eingebunden." -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "Testen des festgelegten Pfades auf Existenz mittels GIO" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "Erstelle Testverzeichnis" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "Testdatei auf Existenz prüfen" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "Datei erstellen" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "Testdatei erneut einlesen" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "Datei entfernen" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "Verzeichnis entfernen" @@ -1031,8 +965,7 @@ "\n" "%s." -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "Simple Backup Fehler" @@ -1400,33 +1333,33 @@ msgid "there was a problem initializing the pynotify module" msgstr "Es gab ein Problem beim Laden des pynotify Modul." -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "Verbindung zu Benachrichtigungsdienst fehlgeschlagen: %s" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "Simple Backup" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "Dialogfenster anzeigen" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "Sicherung abbrechen" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "Verbindung zu D-Bus Dienst verloren." -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "Verbindung wiederhergestellt" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." @@ -1434,32 +1367,24 @@ "Verbindung zum D-Bus Dienst wurde unterbrochen und es findet keine Sicherung " "statt. Simple Backup Statusanzeige wird beendet." -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "Sicherungsvorgang wird gestartet" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "Sicherungsvorgang wird beendet" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" -"Es sind snapshots in einem alten Format vorhanden. Bitte konvertieren sie " -"diese mit Hilfe des Restoration Tools um sie nutzen zu können." - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "Unbekanntes D-Bus Ereignis `%s` erhalten." -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "Erneut versuchen" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." @@ -1467,66 +1392,66 @@ "Es wurde versucht eine weitere Instanz von Simple Backup zu starten obwohl " "bereits diese Instanz läuft." -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "Fenster konnte nicht angezeigt werden: %s" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" "Soll der Sicherungsvorgang des Profils '%s' wirklich abgebrochen werden?" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "Laufenden Sicherungsvorgang abbrechen?" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "Sicherungsvorgang konnte nicht abgebrochen werden." -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "Profil: %s" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "Größe der Sicherung: %s" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "%.1f%% erledigt" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "Verbleibende Zeit: %s" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "PID des abzubrechenden Sicherungsvorgangs: %s" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "Konnte kein Signal an Prozess %s senden" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "Sende Signal mittels gksu an Prozess %s" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "Senden des Signals mittels gksu an Prozess %s fehlgeschlagen" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1539,7 +1464,7 @@ "Der angegebene Pfad '%s' kann nicht gefunden werden.\n" "\n" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " @@ -1549,70 +1474,70 @@ "den Sicherungsvorgang abbrechen. Die festgelegte Sicherung wird in %s " "Sekunden automatisch erneut verwendet." -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "unbekannt" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "weniger als 1 Minute" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "ungefähr 2 Minuten" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "ungefähr 3 Minuten" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "ungefähr 4 Minuten" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "ungefähr 5 Minuten" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "ungefähr %.0f Minuten" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "Vorgang läuft" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "Fertiggestellt" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "Fortschritt: unbekannt" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "Sicherung wird vorbereitet" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "Dateiinformationen sammeln" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "Fortschritt: abgebrochen" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "Ein Fehler trat auf" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "Eine andere `Simple Backup Statusanzeige` läuft bereits." -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "Initialisierung von GTK+ fehlgeschlagen: %s" @@ -1647,7 +1572,7 @@ msgid "Restore..." msgstr "Wiederherstellen..." -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "Wiederherstellen unter..." @@ -1655,12 +1580,12 @@ msgid "Revert..." msgstr "Rückgängig machen..." -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "Rückgängig machen unter..." #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "k.A." @@ -1736,15 +1661,12 @@ msgid "No backups found for this day." msgstr "Keine Sicherungen für dieses Datum gefunden." -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" -"Diese Version der Sicherung wird nicht unterstützt (nur Version " -"%(supportedversion)s wird unterstützt). Version '%(currentversion)s' wurde " -"gefunden. Sie sollten die Sicherung upgraden. " #: src/sbackup/ui/restoregui.py:643 msgid "Select restore location" @@ -1771,69 +1693,6 @@ msgstr "Einlesen der Sicherung..." #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "Die Version der Sicherung ist neuer als die unterstützten Versionen!" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" -"Wenn Sie die gewählte Sicherungsdatei '%s' aktualisieren, kann das Ihre " -"Sicherung für diesen Zeitpunkt zerstören. Sie können die Aktion nicht " -"rückgängig machen. Es wird empfohlen, dass Sie eine Kopie der " -"Sicherungsdatei erstellen, bevor Sie sie aktualisieren. Der " -"Aktualisierungsprozess dauert eine Weile, haben Sie einen Augenblick " -"Geduld.\n" -"\n" -"Sind Sie sicher, dass Sie die Sicherungsdatei jetzt aktualisieren möchten?" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "Möchten Sie die Sicherung wirklich aktualisieren?" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "Sicherung aktualisieren '%s'" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "Sicherung wurde erfolgreich aktualisiert." - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "Einfache Aktualisierung der Sicherungsdatei" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "Upgrade beendet" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" -"Beim Versuch die Sicherung zu aktualisieren trat folgender Fehler auf:\n" -"%s" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "Upgrade der Sicherung konnte nicht durchgeführt werden" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" -"Möchten Sie wirklich die Basis von '%(current)s' auf '%(base)s' ändern?" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1846,11 +1705,11 @@ "\n" "Sind Sie sicher, dass Sie die Sicherungsdatei endgültig löschen wollen?" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "Möchten Sie diese Sicherung wirklich entfernen?" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" @@ -1859,11 +1718,11 @@ "Beim Löschen der Sicherung trat folgender Fehler auf:\n" "%s" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "Sicherung konnte nicht gelöscht werden" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1877,35 +1736,35 @@ "Löschen Sie alle abhängigen Sicherungen, um diese Sicherungsdatei löschen zu " "können." -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "Konnte Sicherung nicht entfernen." -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "Aktion wird abgebrochen" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "Simple Backup Wiederherstellung" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "Wiederherstellung der ausgewählten Dateien" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "Die Wiederherstellung von '%s' wird durchgeführt." -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "Wiederherstellung von '%s' war erfolgreich." -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1916,7 +1775,7 @@ "\n" "Folgender Fehler trat auf:\n" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1925,7 +1784,7 @@ "Wiederherstellung von '%(source)s'\n" "nach '%(dirname)s' wird ausgeführt." -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1934,7 +1793,7 @@ "Wiederherstellung von '%(source)s'\n" "nach '%(dirname)s' war erfolgreich." -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1947,21 +1806,21 @@ "\n" "Folgender Fehler trat auf::\n" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "Änderungen an ausgewählten Dateien werden rückgängig gemacht" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "Rückgängig machen von '%s' wird durchgeführt.\n" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "Rückgängig machen von '%s' war erfolgreich." -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1972,7 +1831,7 @@ "\n" "Es trat folgender Fehler auf:\n" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1981,7 +1840,7 @@ "Rückgängig machen von '%(source)s'\n" "nach '%(dirname)s' wird durchgeführt." -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1990,7 +1849,7 @@ "Rückgängig machen von '%(source)s'\n" "nach '%(dirname)s' war erfolgreich." -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -2025,16 +1884,11 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "Datei '%(file)s' existiert nicht." - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" "Auf Datei '%(file)s' kann nicht zugegriffen werden. Fehler '%(error)s'." -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." @@ -2042,58 +1896,58 @@ "Datei '%(file)s' kann nicht zum Lesen geöffnet werden. Zeitüberschreitung " "beim Öffnen." -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" "Datei '%(file)s' kann nicht zum Lesen geöffnet werden. Fehler '%(error)s'." -#: src/sbackup/util/filecollect.py:385 -#, python-format -msgid "File '%(file)s' is backup's target directory." -msgstr "Pfad '%(file)s' ist das Zielverzeichnis der Sicherung." - -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:372 #, python-format msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" "Symbolische Verknüpfung '%(path)s' -> '%(ln_target)s' erzeugt einen " "Kreisbezug." -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." -msgstr "" -"Datei '%(file)s' überschreitet die maximale Dateigröße ( %(filesize)s > " -"%(maxsize)s)." +msgid "File '%(file)s' is backup's target directory." +msgstr "Pfad '%(file)s' ist das Zielverzeichnis der Sicherung." -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:393 +#, python-format +msgid "Path '%(file)s' defined in excludes list." +msgstr "Pfad '%(file)s' ist in der 'Nicht Sichern'-Liste vorhanden." + +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "Pfad '%(file)s' erfüllt den Regulären Ausdruck '%(regex)s'." -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." -msgstr "Pfad '%(file)s' ist in der 'Nicht Sichern'-Liste vorhanden." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgstr "" +"Datei '%(file)s' überschreitet die maximale Dateigröße ( %(filesize)s > " +"%(maxsize)s)." -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "Fehler beim Testen des Verzeichnisses '%(dir)s': %(error)s." -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "Leerer Regulärer Ausdruck gefunden. Wird ausgelassen." -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "Ungültiger Regulärer Ausdruck ('%s') gefunden. Wird ausgelassen." -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "Keine Verzeichnisse zum Sichern festgelegt." @@ -2234,7 +2088,7 @@ #: data/ui/sbackup-config.glade:1016 data/ui/sbackup-config.glade:1140 msgid "Set default settings..." -msgstr "Standartwerte setzen..." +msgstr "Standardwerte setzen..." #: data/ui/sbackup-config.glade:1037 msgid "Profile Manager..." @@ -2681,6 +2535,55 @@ msgid "Make a full backup" msgstr "Eine vollständige Sicherung durchführen" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Dateien/Verzeichnisse wiederherstellen" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Quellordner wiederherstellen" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Verfügbare Datensicherungen:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Eigene Einstellung verwenden:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Standard verwenden:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Wiederherzustellende Dateien und Ordner" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Wiederherstellen" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Wiederherstellen als..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "Sicherungsziel" @@ -2741,49 +2644,37 @@ msgid "Delete" msgstr "Entfernen" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "Sicherungsdatei aktualisieren" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "Version umstellen" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "Verlauf der Sicherungen" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "Derzeitige Datengrundlage:" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" "Wählen Sie aus dieser Liste eine Sicherung aus um diese als " "Ausgangssicherung zu verwenden." -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "Ausgangssicherung umstellen" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "Verwaltung von Sicherungen" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "Details der Sicherung" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "Wiederherstellung von Dateien/Ordner aus der ausgewählten Sicherung" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Wiederherstellen" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" @@ -2791,364 +2682,172 @@ "Rekursive Wiederherstellung von Dateien/Ordner aus der ausgewählten " "Sicherung beginnend mit der ersten Ausgangssicherung" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "Änderungen rückgängig machen" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "Wiederherstellung" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "Export-Verwaltung" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "Überschrift" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "Inhalt" -#~ msgid "(Not So) Simple Backup error" -#~ msgstr "(Not So) Simple Backup Fehler" - -#~ msgid "sbackup restoration" -#~ msgstr "sbackup-Wiederherstellung" - -#~ msgid "Import of module 'pynotify' failed with error: %s." -#~ msgstr "Import des Moduls 'pynotify' fehlgeschlagen. Fehler: %s." - -#~ msgid "Failed to set the gid to 'admin' one :" -#~ msgstr "Fehler beim Setzen der GID zur Gruppe 'admin':" - -#~ msgid "Setting split size." -#~ msgstr "Setzen der Größe geteilter Sicherungen." - -#~ msgid "Preparation of backup is done. Archive is being created." -#~ msgstr "Vorbereitung der Sicherung abgeschlossen. Archiv wird erstellt." - -#~ msgid "Target not writeable: " -#~ msgstr "Ziel ist nicht beschreibbar: " - -#~ msgid "Invalid value of the target directory : " -#~ msgstr "Ungültiger Wert für das Zielverzeichnis: " - -#~ msgid "" -#~ "Got a non valid snapshot '%(name)s' due to name convention : %(error_cause)s " -#~ msgstr "" -#~ "Ungültige Sicherung '%(name)s' gefunden, fehlerhaftes Namensformat: " -#~ "%(error_cause)s " - -#~ msgid "Deleting snapshot: '%(snp)s'." -#~ msgstr "Löschen der Sicherung: '%(snp)s'." - -#~ msgid "Cannot downgrade other format than 'gzip' to 1.4" +#, python-format +#~ msgid "No need to rebase a full snapshot '%s'" #~ msgstr "" -#~ "Nur Sicherungen im Format 'gzip' können auf die ältere Version 1.4 " +#~ "Die Datengrundlage einer vollständigen Sicherung '%s' braucht nicht " #~ "umgestellt werden" +#, python-format #~ msgid "" -#~ "A backup run is initiated in the background.\n" -#~ "The process id is: %s." -#~ msgstr "" -#~ "Ein Sicherungsvorgang wurde als Hintergrundprozess gestartet.\n" -#~ "Die Prozess-Id lautet: %s." - -#~ msgid "Test on '%s' didn't succeed!" -#~ msgstr "Der Test mit '%s' schlug fehl!" - -#~ msgid "'%d' test(s) didn't succeed !" -#~ msgstr "'%d' Test(s) sind fehlgeschlagen!" - -#~ msgid "Test Succeeded !" -#~ msgstr "Test war erfolgreich!" - -#~ msgid "Target directory is writable." -#~ msgstr "Zielverzeichnis ist nicht schreibbar." - -#~ msgid "" -#~ "Please change target directory and test writability of the target directory " -#~ "by pressing \"Test\" button on the right." -#~ msgstr "" -#~ "Bitte ändern Sie das Zielverzeichnis und testen Sie, ob Schreiben möglich " -#~ "ist durch Anklicken des 'Test'-Buttons." - -#~ msgid "remove" -#~ msgstr "Entfernen" - -#~ msgid "disable" -#~ msgstr "Deaktivieren" - -#~ msgid "" -#~ "You can't %s the Default Profile. Please use it if you need only one profile." -#~ msgstr "" -#~ "Das Standardprofil kann nicht %s werden. Bitte nutze es, falls du nur ein " -#~ "Profil benötigst." - -#~ msgid "" -#~ "The program is going to be terminated. Please make sure the missing " -#~ "directory exists (e.g. by mounting an external disk) or change the specified " -#~ "target in '(Not So) Simple Backup-Configuration' tool and restart this " -#~ "application." +#~ "'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " #~ msgstr "" -#~ "Die Anwendung wird beendet. Bitte sicherstellen, dass das fehlende " -#~ "Verzeichnis existiert (z.B. durch das Anschließen einer externen Festplatte) " -#~ "oder das festgelegte Zielverzeichnis in '(Not So) Simple Backup-" -#~ "Einstellungen' ändern. Anschließend diese Anwendung erneut starten." - -#~ msgid "An error occurred during initialization:" -#~ msgstr "Während der Initialisierung ist ein Fehler aufgetreten:" - -#~ msgid "Actual base : %s" -#~ msgstr "Derzeitige Ausgangssicherung: %s" - -#~ msgid "(Not So) Simple Backup restoration error" -#~ msgstr "(Not So) Simple Backup Wiederherstellung Fehler" +#~ "'%(snapshotToRebase)s' enthält keine 'base'-Datei, es ist möglicherweise " +#~ "beschädigt " +#, python-format #~ msgid "" -#~ "Are you sure that you want to remove snapshot '%s'?\n" -#~ "\n" -#~ "This may take a while - be patient." +#~ "Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " +#~ "'%(NewBaseSnapshot)s' " #~ msgstr "" -#~ "Soll die Sicherung '%s' wirklich entfernt werden?\n" -#~ "\n" -#~ "Dieser Vorgang kann einige Zeit in Anspruch nehmen - bitte geduldig sein." +#~ "Die Datengrundlage eine Sicherung kann nicht auf eine jüngere Sicherung " +#~ "umgestellt werden: '%(snapshotToRebase)s' <= '%(NewBaseSnapshot)s' " -#~ msgid "The mandatory 'ver' file doesn't exist in [%s]." -#~ msgstr "Die notwendige Datei 'ver' existiert nicht in [%s]." +#, python-format +#~ msgid "Rebasing '%(current)s' on '%(base)s'" +#~ msgstr "Ändern der Basis von '%(current)s' auf '%(base)s'" -#~ msgid "Command 'env' failed." -#~ msgstr "Befehl 'env' ist fehlgeschlagen." +#, python-format +#~ msgid "An error occurred when pulling snapshot '%s'." +#~ msgstr "Während des Lesens der Sicherung '%s' ist ein Fehler aufgetreten." -#~ msgid "Unable to make a proper backup. TAR was terminated." -#~ msgstr "" -#~ "Es konnte keine fehlerfreie Sicherung erstellt werden. TAR wurde vorzeitig " -#~ "abgebrochen." +#, python-format +#~ msgid "Base of snapshot '%s' is not set." +#~ msgstr "Ausgangssicherung des Sicherung '%s' ist nicht gesetzt." -#~ msgid "" -#~ "This dialogue helps you to manage your configuration profiles. You can set " -#~ "up a number of configuration profiles that will be run by sbackup when it " -#~ "starts the backup. Thanks to this you can configure backups of different " -#~ "kinds to different places." -#~ msgstr "" -#~ "Dieser Dialog hilft bei der Verwaltung von Profilen. Es können eine Vielzahl " -#~ "von Profilen mit jeweils eigenen und unabhängigen Konfigurationen erstellt " -#~ "werden, die während des Sicherungsvorgangs abgearbeitet werden. Mit Hilfe " -#~ "von Profilen können unterschiedliche Arten von Sicherungen in " -#~ "unterschiedliche Zielverzeichnisse erstellt werden." +#, python-format +#~ msgid "Cancelling pull of snapshot '%s'" +#~ msgstr "Zugriff auf Sicherung '%s' abgebrochen" -#~ msgid "" -#~ "Choose the compression format that you want to apply.\n" -#~ "Default is gzip." -#~ msgstr "" -#~ "Wählen Sie das gewünschte Kompressionsverfahren.\n" -#~ "Standardmäßig wird mit gzip komprimiert." +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "Umstellung von v1.0 auf v1.2: %s" -#~ msgid "" -#~ "Split the backup archive into small pieces (value in MiB).\n" -#~ "Important note: This functionality is not compatible with compressed " -#~ "backups!" -#~ msgstr "" -#~ "Das Sicherungsarchiv in Teilstücke aufteilen (Wert in MiB).\n" -#~ "Wichtiger Hinweis: Diese Funktion kann nicht in Verbindung mit " -#~ "komprimierten Sicherungen verwendet werden!" +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "Umstellung auf v1.3: %s" -#~ msgid "Remote paths" -#~ msgstr "Entfernte Pfade" +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "Umstellung auf v1.4: %s" -#~ msgid "" -#~ "Using this window you can manage your backups, restore them, revert an " -#~ "existing directory to a previous state..." -#~ msgstr "" -#~ "Mit diesem Dialog können Sicherungen verwaltet werden, Dateien wieder " -#~ "hergestellt, vorherige Zustände von vorhandenen Verzeichnissen restauriert " -#~ "werden..." +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "Umstellung auf v1.5: %s" -#~ msgid "" -#~ "Select the directory in which you have your backups.\n" -#~ "You can use a local or distant directory depending on the " -#~ "plugins you have installed." +#, python-format +#~ msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." #~ msgstr "" -#~ "Wählen Sie ein Verzeichnis mit ihren Sicherungen.\n" -#~ "Abhängig von den installierten Plugins können Sie lokale oder " -#~ "entfernte Verzeichnisse auswählen." - -#~ msgid "Use the default directory : " -#~ msgstr "Standard-Verzeichnis benutzen: " - -#~ msgid "Use a custom directory : " -#~ msgstr "Benutzerdefiniertes Verzeichnis benutzen: " - -#~ msgid "Snapshots directory" -#~ msgstr "Verzeichnis mit Sicherungen" - -#~ msgid "Restore As" -#~ msgstr "Wiederherstellen unter" +#~ "Die SNAR-Datei existiert bereits für die Sicherung '%s'. Sie wird nicht " +#~ "überschrieben." -#~ msgid "Revert As" -#~ msgstr "Änderungen rückgängig machen unter" +#~ msgid "The version of the snapshot is greater than the supported one!" +#~ msgstr "Die Version der Sicherung ist neuer als die unterstützten Versionen!" -#~ msgid "Choose to upgrade your snapshot if needed." -#~ msgstr "Wählen um die Version Ihrer Sicherung umzustellen, falls notwendig." +#~ msgid "Unable to upgrade snapshot" +#~ msgstr "Upgrade der Sicherung konnte nicht durchgeführt werden" -#~ msgid "Actual base :" -#~ msgstr "Derzeitige Ausgangssicherung:" - -#~ msgid "Select a snapshot and change its base to another snapshot." +#, python-format +#~ msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" #~ msgstr "" -#~ "Ausgangssicherung einer inkrementellen Sicherung auf eine andere Sicherung " -#~ "umstellen." - -#~ msgid "BackupManager created " -#~ msgstr "BackupManager wurde erzeugt " - -#~ msgid "Initializing FUSE FILE ACCESS MANAGER !" -#~ msgstr "Initialisiere FUSE FILE ACCESS MANAGER!" +#~ "Möchten Sie wirklich die Basis von '%(current)s' auf '%(base)s' ändern?" -#~ msgid "Problem with '%(file)s' : %(error)s " -#~ msgstr "Problem mit '%(file)s' : %(error)s " +#, python-format +#~ msgid "File '%(file)s' does not exist." +#~ msgstr "Datei '%(file)s' existiert nicht." -#~ msgid "Log settings" -#~ msgstr "Log-Einstellungen" +#~ msgid "Upgrade" +#~ msgstr "Version umstellen" #~ msgid "" -#~ "Debug is just for debbuging purpose\n" -#~ "Info is the recommended setting" +#~ "There are snapshots stored in outdated snapshot formats. Please upgrade them " +#~ "using 'Simple Backup-Restoration' if you want to use them." #~ msgstr "" -#~ "Die empfohlene Einstellung ist 'Info'. Die Einstellung\n" -#~ "'Debug' ist für Entwicklerzwecke vorgesehen." - -#~ msgid "Parameters" -#~ msgstr "Parameter" +#~ "Es gibt Sicherungen die in einem veralteten Sicherungsformat gespeichert " +#~ "wurden. Bitte diese Sicherungen mit Hilfe der Anwendung 'Simple Backup " +#~ "Wiederherstellung' upgraden um sie zu verwenden." -#~ msgid "Security" -#~ msgstr "Sicherheit" +#, python-format +#~ msgid "Unable to remove upgrade stamp: %s" +#~ msgstr "Upgrade-Hinweis konnte nicht entfernt werden: %s" #~ msgid "" -#~ "'%(file)s' size is higher than the specified one ( %(filesize)s > " -#~ "%(maxsize)s), it has to be exclude " +#~ "There are snapshots with old snapshot format. Please upgrade these using the " +#~ "Restoration tool if you want to use them." #~ msgstr "" -#~ "'%(file)s' Dateigröße ist größer als festgelegte Maximalgröße ( %(filesize)s " -#~ "> %(maxsize)s), wird ausgelassen " - -#~ msgid "got an error with '%(file)s' : %(error)s" -#~ msgstr "Fehler bei '%(file)s' : %(error)s" - -#~ msgid "Target '%s' directory is excluded" -#~ msgstr "Zielverzeichnis '%s' wird ausgelassen" - -#~ msgid "'%(file)s' doesn't exist, it has to be exclude " -#~ msgstr "'%(file)s' existiert nicht, wird ausgelassen " +#~ "Es sind snapshots in einem alten Format vorhanden. Bitte konvertieren sie " +#~ "diese mit Hilfe des Restoration Tools um sie nutzen zu können." +#, python-format #~ msgid "" -#~ "We don't have read access to '%(file)s', it has to be exclude : %(error)s " +#~ "Snapshot version is not supported (Only %(supportedversion)s is supported). " +#~ "Version '%(currentversion)s' found. You should upgrade it. " #~ msgstr "" -#~ "Kein Lesezugriff auf '%(file)s' möglich, wird ausgelassen: %(error)s " - -#~ msgid "Terminating FUSE FILE ACCESS MANAGER !" -#~ msgstr "Beenden des FUSE FILE ACCESS MANAGER !" +#~ "Diese Version der Sicherung wird nicht unterstützt (nur Version " +#~ "%(supportedversion)s wird unterstützt). Version '%(currentversion)s' wurde " +#~ "gefunden. Sie sollten die Sicherung upgraden. " +#, python-format #~ msgid "" -#~ "When setting a username (resp password), password (resp username) is " -#~ "mandatory" +#~ "While attempting to upgrade snapshot the following error occurred:\n" +#~ "%s" #~ msgstr "" -#~ "Beim Festlegen eines Benutzernamens (bzw. Kennwortes) ist die Angabe eines " -#~ "Kennwortes (bzw. Benutzernamens) zwingend" +#~ "Beim Versuch die Sicherung zu aktualisieren trat folgender Fehler auf:\n" +#~ "%s" -#~ msgid "Choose the SSL option (smtptls=1) to be able to use Cert and Key" -#~ msgstr "" -#~ "Wählen Sie die Option SSL (smtptls=1) um ein Zertifikat und einen Schlüssel " -#~ "zu verwenden (Cert & Key)" +#~ msgid "Do you really want to upgrade snapshot?" +#~ msgstr "Möchten Sie die Sicherung wirklich aktualisieren?" -#~ msgid "I didn't find the log file. Please set it up in sbackup.conf " -#~ msgstr "" -#~ "Die Logdatei wurde nicht gefunden. Bitte legen Sie eine Logdatei in " -#~ "'sbackup.conf' fest. " +#, python-format +#~ msgid "Upgrade snapshot '%s'" +#~ msgstr "Sicherung aktualisieren '%s'" -#~ msgid "No directory to backup !" -#~ msgstr "Kein Verzeichnis zu sichern!" +#~ msgid "Snapshot was sucessfully upgraded." +#~ msgstr "Sicherung wurde erfolgreich aktualisiert." -#~ msgid "Save to file ..." -#~ msgstr "Konfigurationsdatei speichern unter ..." +#~ msgid "Upgrade finished" +#~ msgstr "Upgrade beendet" -#~ msgid "Set the reciever of this mail" -#~ msgstr "Empfänger dieser E-Mail setzen" +#~ msgid "Simple Backup upgrade" +#~ msgstr "Einfache Aktualisierung der Sicherungsdatei" +#, python-format #~ msgid "" -#~ "Please enter the new profile name in the Profile name entry and check " -#~ "the Enable checkbox to enable it." -#~ msgstr "" -#~ "Bitte geben Sie einen Namen für das neue Profil im Feld Name des " -#~ "Profils ein und setzen Sie einen Haken bei Profil verwenden um " -#~ "das Profil zu aktivieren." - -#~ msgid "Got an exception when Pulling '%s' : " -#~ msgstr "Ausnahmefehler beim Zugriff auf Sicherung '%s': " - -#~ msgid "Snapshot '%s' is a full . Can't rebase on older snapshot" -#~ msgstr "" -#~ "'%s' ist eine vollständige Sicherung. Datengrundlage kann nicht auf eine " -#~ "ältere Sicherung umgestellt werden." - -#~ msgid "Deleting '%(snp)s' for purge !" -#~ msgstr "Aufräumen: '%(snp)s' wird gelöscht!" - -#~ msgid "Non existing directory : %s" -#~ msgstr "Verzeichnis existiert nicht: %s" - -#~ msgid "gtk-cancel" -#~ msgstr "gtk-cancel" - -#~ msgid "gtk-no" -#~ msgstr "gtk-no" - -#~ msgid "gtk-yes" -#~ msgstr "gtk-yes" - -#~ msgid "gtk-close" -#~ msgstr "gtk-close" - -#~ msgid "gtk-remove" -#~ msgstr "gtk-remove" - -#~ msgid "gtk-add" -#~ msgstr "gtk-add" - -#~ msgid "gtk-edit" -#~ msgstr "gtk-edit" - -#~ msgid "gtk-ok" -#~ msgstr "gtk-ok" - -#~ msgid "Test all" -#~ msgstr "Alle Testen" - -#~ msgid "Starting snapshot %(name)s " -#~ msgstr "Beginne mit Erstellung der Datensicherung %(name)s " - -#~ msgid "Time (for admins only)" -#~ msgstr "Automatische Sicherungen" - -#~ msgid "Unable to change permissions for " -#~ msgstr "Zugriffsrechte konnten nicht geändert werden für " - -#~ msgid "sbackup configuration error" -#~ msgstr "sbackup Konfigurationsfehler" - -#~ msgid "This is a user friendly backup solution for common desktop needs." +#~ "Upgrading the selected snapshot `%s` might corrupt your backup for this " +#~ "particular point in time. You cannot undo this operation. It is recommended " +#~ "to create a copy of the snapshot directory before upgrading it. The upgrade " +#~ "process takes a while - be patient.\n" +#~ "\n" +#~ "Are you sure that you want to upgrade the snapshot now?" #~ msgstr "" -#~ "Dies ist eine benutzerfreundliche Backup-Lösung für alltägliche Aufgaben im " -#~ "Desktop-Bereich." - -#~ msgid "Terminating FUSE FILE ACCESS MANAGER!" -#~ msgstr "Beenden des FUSE File Access Manager!" - -#~ msgid "File list ready, committing to disk." -#~ msgstr "Erstellen der Datei-Liste ist beendet, wird auf Platte geschrieben." +#~ "Wenn Sie die gewählte Sicherungsdatei '%s' aktualisieren, kann das Ihre " +#~ "Sicherung für diesen Zeitpunkt zerstören. Sie können die Aktion nicht " +#~ "rückgängig machen. Es wird empfohlen, dass Sie eine Kopie der " +#~ "Sicherungsdatei erstellen, bevor Sie sie aktualisieren. Der " +#~ "Aktualisierungsprozess dauert eine Weile, haben Sie einen Augenblick " +#~ "Geduld.\n" +#~ "\n" +#~ "Sind Sie sicher, dass Sie die Sicherungsdatei jetzt aktualisieren möchten?" -#~ msgid "No path to log file specified. Please set it in the configuration." -#~ msgstr "" -#~ "Kein Pfad zur Logdatei angegeben. Bitte einen Pfad in der Konfiguration " -#~ "festlegen." +#~ msgid "Upgrade snapshot" +#~ msgstr "Sicherungsdatei aktualisieren" diff -Nru sbackup-0.11.4/po/el.po sbackup-0.11.6/po/el.po --- sbackup-0.11.4/po/el.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/el.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:53+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:46+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,55 +42,60 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" Kainourgiakis Giorgos https://launchpad.net/~kaingeo\n" +" Thanos Lefteris https://launchpad.net/~alefteris\n" +" attikon https://launchpad.net/~attikon\n" +" christosvas https://launchpad.net/~christosvas" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -102,131 +107,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -336,65 +341,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Προσαρμοσμένo" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Μουσική MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "Βίντεο AVI" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "Βίντεο MPEG" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Βίντεο Matrjoshka" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "Περιέκτης πολυμέσων OGG" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Εικόνες CD" @@ -410,328 +415,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.3: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -743,18 +679,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -766,65 +702,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -914,8 +854,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1212,126 +1151,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1340,77 +1273,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1439,7 +1372,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1447,12 +1380,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1528,11 +1461,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1558,58 +1491,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1618,22 +1499,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1642,35 +1523,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1678,21 +1559,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1701,21 +1582,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1723,21 +1604,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1768,67 +1649,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2359,6 +2235,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Επαναφορά αρχείων/καταλόγων" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Επαναφορά Φακέλου Προέλευσης" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Διαθέσιμα αντίγραφα ασφαλείας:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Χρήση προσαρμοσμένου" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Χρήση προεπιλεγμένων:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Αρχεία και Φάκελοι για επαναφορά" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Επαναφορά" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Επαναφορά Ως..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2411,68 +2336,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Επαναφορά" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/en_AU.po sbackup-0.11.6/po/en_AU.po --- sbackup-0.11.4/po/en_AU.po 2011-02-13 18:22:15.000000000 +0100 +++ sbackup-0.11.6/po/en_AU.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:35+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: English (Australia) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "No log file specified." @@ -45,34 +45,34 @@ "\n" "Now continue processing remaining profiles." -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "The following error(s) occurred before:" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " @@ -82,19 +82,19 @@ "want to help by submitting bugs, by translating or anything else please " "visit our website." -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -110,74 +110,74 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" "For the moment split functionality is not compatible with compress option." -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "Unable to change permissions for file '%s'." -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "Launching TAR to make incremental backup." -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "Unable to find the SNAR file to make an incremental backup." -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "Falling back to full backup." -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "Launching TAR to make a full backup." -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "Leading '/' from member names were removed." -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "Leading '/' from hard link targets were removed." -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "TAR has been finished successfully." -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "TAR returned a warning: %s" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" @@ -186,58 +186,58 @@ "TAR returned warnings:\n" "%s" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "Included" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "Not changed" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "Directory" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "Line must be a string" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "Dumpdir inconsistency : 'filename' is empty" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "Dumpdir inconsistency : 'control' is empty" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "File '%s' does not exist." -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "The snarfile header is incomplete." -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "A SnapshotFile is required" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "Directory does not exist: %s." @@ -356,65 +356,65 @@ "When specifying a SSL certificate or key file, a key file resp. certificate " "is mandatory." -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Default Profile" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Unknown Profile" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "Unlimited" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "100 MiB" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "250 MiB" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "650 MiB" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "2 GiB (FAT16)" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "4 GiB (FAT32)" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Custom" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3 Music" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI Video" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG Video" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matrjoshka Video" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "OGG Multimedia container" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "CD Images" @@ -430,300 +430,227 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "Snapshot '%s' not found " -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "No need to rebase a full snapshot '%s'" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "Rebasing '%(current)s' on '%(base)s'" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "An error occurred when pulling snapshot '%s'." - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "The snarfile header is incomplete !" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "Base of snapshot '%s' is not set." - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "Cancelling pull of snapshot '%s'" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "Upgrading from v1.0 to v1.2: %s" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "Upgrading to v1.3: %s" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "Upgrading to v1.4: %s" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "Upgrading to v1.5: %s" - -#: src/sbackup/core/UpgradeManager.py:300 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." +msgid "Running of hooks: %s" msgstr "" -"The SNAR file already exist for snapshot '%s'. It is not overwritten." -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "Snapshot '%(name)s' is being made." -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "Setting Base to '%(value)s'." -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "Setting packages File." -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "Problem when setting the packages list: " -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "Setting Excludes File." -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "Option 'Follow symbolic links' is enabled." -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "Option 'Follow symbolic links' is disabled." -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "Backup process finished." -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "Number of directories: %s." -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "Total number of files: %s." -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "Number of symlinks: %s." -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "Number of files included in snapshot: %s." -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "Number of new files (also included): %s." -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "Number of files skipped in incremental snapshot: %s." -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "Number of items forced to be excluded: %s." -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "Number of items to be excluded by config: %s." -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "Maximum free size required is '%s'." -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "Available disk size is '%s'." -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "Unable to find logfile to copy into snapshot." -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "No snapshot to copy logfile." -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "Target directory '%(target)s' does not exist." -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "Snapshot is inconsistent: __name is not set " -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "Name of snapshot '%s' doesn't match requirement" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "Snapshot is inconsistent: __snapshotpath is not set " -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " @@ -732,33 +659,33 @@ "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "Name of Snapshot not valid : %s" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "Name of base not valid : %s" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "Base name must be set for incremental backup." @@ -770,18 +697,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "Terminating FUSE File Access Manager." -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -793,65 +720,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -956,8 +887,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1276,126 +1206,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1404,77 +1328,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1503,7 +1427,7 @@ msgid "Restore..." msgstr "Restore..." -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "Restore as..." @@ -1511,12 +1435,12 @@ msgid "Revert..." msgstr "Revert..." -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "Revert as..." #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1592,11 +1516,11 @@ msgid "No backups found for this day." msgstr "No backups found for this day." -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1622,58 +1546,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "The version of the snapshot is greater than the supported one!" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "Unable to upgrade snapshot" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "Do you really want to rebase '%(current)s' on '%(base)s' ?" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1682,22 +1554,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1706,35 +1578,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "Restoring of selected files" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "Restoring of '%s' is in progress." -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "Restoring of '%s' was successful." -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1742,7 +1614,7 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1751,7 +1623,7 @@ "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1760,7 +1632,7 @@ "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1769,21 +1641,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "Reverting selected files" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "Reverting of '%s' is in progress.\n" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "Reverting of '%s' was successful." -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1791,7 +1663,7 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1800,7 +1672,7 @@ "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1809,7 +1681,7 @@ "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1840,70 +1712,65 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "File '%(file)s' does not exist." - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "File '%(file)s' is not accessible with error '%(error)s'." -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" "File '%(file)s' cannot be opened for read access. Operation timed out." -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." -#: src/sbackup/util/filecollect.py:385 -#, python-format -msgid "File '%(file)s' is backup's target directory." -msgstr "File '%(file)s' is backup's target directory." - -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:372 #, python-format msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." -msgstr "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "File '%(file)s' is backup's target directory." +msgstr "File '%(file)s' is backup's target directory." -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:393 +#, python-format +msgid "Path '%(file)s' defined in excludes list." +msgstr "Path '%(file)s' defined in excludes list." + +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "File '%(file)s' matches regular expression '%(regex)s'." -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." -msgstr "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgstr "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "Error while checking directory '%(dir)s': %(error)s." -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "Empty regular expression found. Skipped." -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "Invalid regular expression ('%s') found. Skipped." -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "No directories to backup defined." @@ -2469,6 +2336,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Restore" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2521,245 +2437,128 @@ msgid "Delete" msgstr "Delete" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "Upgrade" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "Snapshot History" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "Select a snapshot on this list to rebase on it." -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "Rebase" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "Snapshot Management" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Restore" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "Revert" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "Restoration Management" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "Export Management" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "Headline" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "Content" -#~ msgid "(Not So) Simple Backup error" -#~ msgstr "(Not So) Simple Backup error" - -#~ msgid "sbackup restoration" -#~ msgstr "sbackup restoration" - -#~ msgid "Import of module 'pynotify' failed with error: %s." -#~ msgstr "Import of module 'pynotify' failed with error: %s." - -#~ msgid "Failed to set the gid to 'admin' one :" -#~ msgstr "Failed to set the gid to 'admin' one :" - -#~ msgid "Setting split size." -#~ msgstr "Setting split size." - -#~ msgid "Target not writeable: " -#~ msgstr "Target not writeable: " - -#~ msgid "Invalid value of the target directory : " -#~ msgstr "Invalid value of the target directory : " - -#~ msgid "" -#~ "Got a non valid snapshot '%(name)s' due to name convention : %(error_cause)s " -#~ msgstr "" -#~ "Got a non valid snapshot '%(name)s' due to name convention : %(error_cause)s " - -#~ msgid "Deleting snapshot: '%(snp)s'." -#~ msgstr "Deleting snapshot: '%(snp)s'." - -#~ msgid "Cannot downgrade other format than 'gzip' to 1.4" -#~ msgstr "Cannot downgrade other format than 'gzip' to 1.4" - -#~ msgid "" -#~ "A backup run is initiated in the background.\n" -#~ "The process id is: %s." -#~ msgstr "" -#~ "A backup run is initiated in the background.\n" -#~ "The process id is: %s." - -#~ msgid "Test on '%s' didn't succeed!" -#~ msgstr "Test on '%s' didn't succeed!" - -#~ msgid "'%d' test(s) didn't succeed !" -#~ msgstr "'%d' test(s) didn't succeed !" - -#~ msgid "Test Succeeded !" -#~ msgstr "Test Succeeded !" - -#~ msgid "Target directory is writable." -#~ msgstr "Target directory is writable." - -#~ msgid "" -#~ "Please change target directory and test writability of the target directory " -#~ "by pressing \"Test\" button on the right." -#~ msgstr "" -#~ "Please change target directory and test writeability of the target directory " -#~ "by pressing \"Test\" button on the right." - -#~ msgid "remove" -#~ msgstr "remove" - -#~ msgid "disable" -#~ msgstr "disable" - -#~ msgid "" -#~ "You can't %s the Default Profile. Please use it if you need only one profile." -#~ msgstr "" -#~ "You can't %s the Default Profile. Please use it if you need only one profile." +#, python-format +#~ msgid "No need to rebase a full snapshot '%s'" +#~ msgstr "No need to rebase a full snapshot '%s'" +#, python-format #~ msgid "" -#~ "The program is going to be terminated. Please make sure the missing " -#~ "directory exists (e.g. by mounting an external disk) or change the specified " -#~ "target in '(Not So) Simple Backup-Configuration' tool and restart this " -#~ "application." +#~ "'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " #~ msgstr "" -#~ "The program is going to be terminated. Please make sure the missing " -#~ "directory exists (e.g. by mounting an external disk) or change the specified " -#~ "target in '(Not So) Simple Backup-Configuration' tool and restart this " -#~ "application." - -#~ msgid "An error occurred during initialization:" -#~ msgstr "An error occurred during initialisation:" - -#~ msgid "Actual base : %s" -#~ msgstr "Actual base : %s" - -#~ msgid "(Not So) Simple Backup restoration error" -#~ msgstr "(Not So) Simple Backup restoration error" +#~ "'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " +#, python-format #~ msgid "" -#~ "Are you sure that you want to remove snapshot '%s'?\n" -#~ "\n" -#~ "This may take a while - be patient." +#~ "Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " +#~ "'%(NewBaseSnapshot)s' " #~ msgstr "" -#~ "Are you sure that you want to remove snapshot '%s'?\n" -#~ "\n" -#~ "This may take a while - be patient." +#~ "Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " +#~ "'%(NewBaseSnapshot)s' " -#~ msgid "The mandatory 'ver' file doesn't exist in [%s]." -#~ msgstr "The mandatory 'ver' file doesn't exist in [%s]." +#, python-format +#~ msgid "Rebasing '%(current)s' on '%(base)s'" +#~ msgstr "Rebasing '%(current)s' on '%(base)s'" -#~ msgid "Command 'env' failed." -#~ msgstr "Command 'env' failed." +#, python-format +#~ msgid "An error occurred when pulling snapshot '%s'." +#~ msgstr "An error occurred when pulling snapshot '%s'." -#~ msgid "Unable to make a proper backup. TAR was terminated." -#~ msgstr "Unable to make a proper backup. TAR was terminated." +#, python-format +#~ msgid "Base of snapshot '%s' is not set." +#~ msgstr "Base of snapshot '%s' is not set." -#~ msgid "" -#~ "This dialogue helps you to manage your configuration profiles. You can set " -#~ "up a number of configuration profiles that will be run by sbackup when it " -#~ "starts the backup. Thanks to this you can configure backups of different " -#~ "kinds to different places." -#~ msgstr "" -#~ "This dialogue helps you to manage your configuration profiles. You can set " -#~ "up a number of configuration profiles that will be run by sbackup when it " -#~ "starts the backup. Thanks to this you can configure backups of different " -#~ "kinds to different places." +#, python-format +#~ msgid "Cancelling pull of snapshot '%s'" +#~ msgstr "Cancelling pull of snapshot '%s'" -#~ msgid "" -#~ "Choose the compression format that you want to apply.\n" -#~ "Default is gzip." -#~ msgstr "" -#~ "Choose the compression format that you want to apply.\n" -#~ "Default is gzip." +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "Upgrading from v1.0 to v1.2: %s" -#~ msgid "" -#~ "Split the backup archive into small pieces (value in MiB).\n" -#~ "Important note: This functionality is not compatible with compressed " -#~ "backups!" -#~ msgstr "" -#~ "Split the backup archive into small pieces (value in MiB).\n" -#~ "Important note: This functionality is not compatible with compressed " -#~ "backups!" +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "Upgrading to v1.3: %s" -#~ msgid "Remote paths" -#~ msgstr "Remote paths" +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "Upgrading to v1.4: %s" -#~ msgid "" -#~ "Using this window you can manage your backups, restore them, revert an " -#~ "existing directory to a previous state..." -#~ msgstr "" -#~ "Using this window you can manage your backups, restore them, revert an " -#~ "existing directory to a previous state..." +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "Upgrading to v1.5: %s" -#~ msgid "" -#~ "Select the directory in which you have your backups.\n" -#~ "You can use a local or distant directory depending on the " -#~ "plugins you have installed." +#, python-format +#~ msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." #~ msgstr "" -#~ "Select the directory in which you have your backups.\n" -#~ "You can use a local or distant directory depending on the plug-" -#~ "ins you have installed." - -#~ msgid "Use the default directory : " -#~ msgstr "Use the default directory : " - -#~ msgid "Use a custom directory : " -#~ msgstr "Use a custom directory : " +#~ "The SNAR file already exist for snapshot '%s'. It is not overwritten." -#~ msgid "Snapshots directory" -#~ msgstr "Snapshots directory" +#~ msgid "The version of the snapshot is greater than the supported one!" +#~ msgstr "The version of the snapshot is greater than the supported one!" -#~ msgid "Restore As" -#~ msgstr "Restore As" +#~ msgid "Unable to upgrade snapshot" +#~ msgstr "Unable to upgrade snapshot" -#~ msgid "Revert As" -#~ msgstr "Revert As" - -#~ msgid "Choose to upgrade your snapshot if needed." -#~ msgstr "Choose to upgrade your snapshot if needed." +#, python-format +#~ msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" +#~ msgstr "Do you really want to rebase '%(current)s' on '%(base)s' ?" -#~ msgid "Actual base :" -#~ msgstr "Actual base :" +#, python-format +#~ msgid "File '%(file)s' does not exist." +#~ msgstr "File '%(file)s' does not exist." -#~ msgid "Select a snapshot and change its base to another snapshot." -#~ msgstr "Select a snapshot and change its base to another snapshot." +#~ msgid "Upgrade" +#~ msgstr "Upgrade" diff -Nru sbackup-0.11.4/po/en_CA.po sbackup-0.11.6/po/en_CA.po --- sbackup-0.11.4/po/en_CA.po 2011-02-13 18:22:17.000000000 +0100 +++ sbackup-0.11.6/po/en_CA.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:26+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: English (Canada) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "No log file specified." @@ -45,34 +45,34 @@ "\n" "Now continue processing remaining profiles." -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "The following error(s) occurred before:" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " @@ -82,19 +82,19 @@ "want to help by submitting bugs, by translating or anything else please " "visit our website." -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -110,74 +110,74 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" "For the moment split functionality is not compatible with compress option." -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "Unable to change permissions for file '%s'." -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "Launching TAR to make incremental backup." -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "Unable to find the SNAR file to make an incremental backup." -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "Falling back to full backup." -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "Launching TAR to make a full backup." -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "Leading '/' from member names were removed." -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "Leading '/' from hard link targets were removed." -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "TAR has been finished successfully." -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "TAR returned a warning: %s" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" @@ -186,58 +186,58 @@ "TAR returned warnings:\n" "%s" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "Included" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "Not changed" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "Directory" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "Line must be a string" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "Dumpdir inconsistency : 'filename' is empty" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "Dumpdir inconsistency : 'control' is empty" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "File '%s' does not exist." -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "The snarfile header is incomplete." -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "A SnapshotFile is required" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "Directory does not exist: %s." @@ -356,65 +356,65 @@ "When specifying a SSL certificate or key file, a key file resp. certificate " "is mandatory." -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Default Profile" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Unknown Profile" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "Unlimited" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "100 MiB" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "250 MiB" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "650 MiB" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "2 GiB (FAT16)" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "4 GiB (FAT32)" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Custom" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3 Music" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI Video" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG Video" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matrjoshka Video" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "OGG Multimedia container" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "CD Images" @@ -430,300 +430,227 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "Snapshot '%s' not found " -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "No need to rebase a full snapshot '%s'" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "Rebasing '%(current)s' on '%(base)s'" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "An error occurred when pulling snapshot '%s'." - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "The snarfile header is incomplete !" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "Base of snapshot '%s' is not set." - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "Cancelling pull of snapshot '%s'" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "Upgrading from v1.0 to v1.2: %s" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "Upgrading to v1.3: %s" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "Upgrading to v1.4: %s" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "Upgrading to v1.5: %s" - -#: src/sbackup/core/UpgradeManager.py:300 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." +msgid "Running of hooks: %s" msgstr "" -"The SNAR file already exist for snapshot '%s'. It is not overwritten." -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "Snapshot '%(name)s' is being made." -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "Setting Base to '%(value)s'." -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "Setting packages File." -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "Problem when setting the packages list: " -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "Setting Excludes File." -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "Option 'Follow symbolic links' is enabled." -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "Option 'Follow symbolic links' is disabled." -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "Backup process finished." -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "Number of directories: %s." -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "Total number of files: %s." -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "Number of symlinks: %s." -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "Number of files included in snapshot: %s." -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "Number of new files (also included): %s." -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "Number of files skipped in incremental snapshot: %s." -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "Number of items forced to be excluded: %s." -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "Number of items to be excluded by config: %s." -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "Maximum free size required is '%s'." -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "Available disk size is '%s'." -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "Unable to find logfile to copy into snapshot." -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "No snapshot to copy logfile." -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "Target directory '%(target)s' does not exist." -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "Snapshot is inconsistent: __name is not set " -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "Name of snapshot '%s' doesn't match requirement" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "Snapshot is inconsistent: __snapshotpath is not set " -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " @@ -732,33 +659,33 @@ "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "Name of Snapshot not valid : %s" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "Name of base not valid : %s" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "Base name must be set for incremental backup." @@ -770,18 +697,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "Terminating FUSE File Access Manager." -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -793,65 +720,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -956,8 +887,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1276,126 +1206,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1404,77 +1328,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1503,7 +1427,7 @@ msgid "Restore..." msgstr "Restore..." -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "Restore as..." @@ -1511,12 +1435,12 @@ msgid "Revert..." msgstr "Revert..." -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "Revert as..." #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1592,11 +1516,11 @@ msgid "No backups found for this day." msgstr "No backups found for this day." -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1622,58 +1546,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "The version of the snapshot is greater than the supported one!" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "Unable to upgrade snapshot" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "Do you really want to rebase '%(current)s' on '%(base)s' ?" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1682,22 +1554,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1706,35 +1578,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "Restoring of selected files" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "Restoring of '%s' is in progress." -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "Restoring of '%s' was successful." -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1742,7 +1614,7 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1751,7 +1623,7 @@ "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1760,7 +1632,7 @@ "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1769,21 +1641,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "Reverting selected files" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "Reverting of '%s' is in progress.\n" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "Reverting of '%s' was successful." -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1791,7 +1663,7 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1800,7 +1672,7 @@ "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1809,7 +1681,7 @@ "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1840,70 +1712,65 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "File '%(file)s' does not exist." - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "File '%(file)s' is not accessible with error '%(error)s'." -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" "File '%(file)s' cannot be opened for read access. Operation timed out." -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." -#: src/sbackup/util/filecollect.py:385 -#, python-format -msgid "File '%(file)s' is backup's target directory." -msgstr "File '%(file)s' is backup's target directory." - -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:372 #, python-format msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." -msgstr "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "File '%(file)s' is backup's target directory." +msgstr "File '%(file)s' is backup's target directory." -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:393 +#, python-format +msgid "Path '%(file)s' defined in excludes list." +msgstr "Path '%(file)s' defined in excludes list." + +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "File '%(file)s' matches regular expression '%(regex)s'." -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." -msgstr "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgstr "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "Error while checking directory '%(dir)s': %(error)s." -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "Empty regular expression found. Skipped." -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "Invalid regular expression ('%s') found. Skipped." -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "No directories to backup defined." @@ -2469,6 +2336,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Restore" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2521,245 +2437,128 @@ msgid "Delete" msgstr "Delete" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "Upgrade" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "Snapshot History" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "Select a snapshot on this list to rebase on it." -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "Rebase" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "Snapshot Management" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Restore" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "Revert" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "Restoration Management" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "Export Management" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "Headline" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "Content" -#~ msgid "(Not So) Simple Backup error" -#~ msgstr "(Not So) Simple Backup error" - -#~ msgid "sbackup restoration" -#~ msgstr "sbackup restoration" - -#~ msgid "Import of module 'pynotify' failed with error: %s." -#~ msgstr "Import of module 'pynotify' failed with error: %s." - -#~ msgid "Failed to set the gid to 'admin' one :" -#~ msgstr "Failed to set the gid to 'admin' one :" - -#~ msgid "Setting split size." -#~ msgstr "Setting split size." - -#~ msgid "Target not writeable: " -#~ msgstr "Target not writeable: " - -#~ msgid "Invalid value of the target directory : " -#~ msgstr "Invalid value of the target directory : " - -#~ msgid "" -#~ "Got a non valid snapshot '%(name)s' due to name convention : %(error_cause)s " -#~ msgstr "" -#~ "Got a non valid snapshot '%(name)s' due to name convention : %(error_cause)s " - -#~ msgid "Deleting snapshot: '%(snp)s'." -#~ msgstr "Deleting snapshot: '%(snp)s'." - -#~ msgid "Cannot downgrade other format than 'gzip' to 1.4" -#~ msgstr "Cannot downgrade other format than 'gzip' to 1.4" - -#~ msgid "" -#~ "A backup run is initiated in the background.\n" -#~ "The process id is: %s." -#~ msgstr "" -#~ "A backup run is initiated in the background.\n" -#~ "The process id is: %s." - -#~ msgid "Test on '%s' didn't succeed!" -#~ msgstr "Test on '%s' didn't succeed!" - -#~ msgid "'%d' test(s) didn't succeed !" -#~ msgstr "'%d' test(s) didn't succeed !" - -#~ msgid "Test Succeeded !" -#~ msgstr "Test Succeeded !" - -#~ msgid "Target directory is writable." -#~ msgstr "Target directory is writable." - -#~ msgid "" -#~ "Please change target directory and test writability of the target directory " -#~ "by pressing \"Test\" button on the right." -#~ msgstr "" -#~ "Please change target directory and test writeability of the target directory " -#~ "by pressing \"Test\" button on the right." - -#~ msgid "remove" -#~ msgstr "remove" - -#~ msgid "disable" -#~ msgstr "disable" - -#~ msgid "" -#~ "You can't %s the Default Profile. Please use it if you need only one profile." -#~ msgstr "" -#~ "You can't %s the Default Profile. Please use it if you need only one profile." +#, python-format +#~ msgid "No need to rebase a full snapshot '%s'" +#~ msgstr "No need to rebase a full snapshot '%s'" +#, python-format #~ msgid "" -#~ "The program is going to be terminated. Please make sure the missing " -#~ "directory exists (e.g. by mounting an external disk) or change the specified " -#~ "target in '(Not So) Simple Backup-Configuration' tool and restart this " -#~ "application." +#~ "'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " #~ msgstr "" -#~ "The program is going to be terminated. Please make sure the missing " -#~ "directory exists (e.g. by mounting an external disk) or change the specified " -#~ "target in '(Not So) Simple Backup-Configuration' tool and restart this " -#~ "application." - -#~ msgid "An error occurred during initialization:" -#~ msgstr "An error occurred during initialization:" - -#~ msgid "Actual base : %s" -#~ msgstr "Actual base : %s" - -#~ msgid "(Not So) Simple Backup restoration error" -#~ msgstr "(Not So) Simple Backup restoration error" +#~ "'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " +#, python-format #~ msgid "" -#~ "Are you sure that you want to remove snapshot '%s'?\n" -#~ "\n" -#~ "This may take a while - be patient." +#~ "Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " +#~ "'%(NewBaseSnapshot)s' " #~ msgstr "" -#~ "Are you sure that you want to remove snapshot '%s'?\n" -#~ "\n" -#~ "This may take a while - be patient." +#~ "Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " +#~ "'%(NewBaseSnapshot)s' " -#~ msgid "The mandatory 'ver' file doesn't exist in [%s]." -#~ msgstr "The mandatory 'ver' file doesn't exist in [%s]." +#, python-format +#~ msgid "Rebasing '%(current)s' on '%(base)s'" +#~ msgstr "Rebasing '%(current)s' on '%(base)s'" -#~ msgid "Command 'env' failed." -#~ msgstr "Command 'env' failed." +#, python-format +#~ msgid "An error occurred when pulling snapshot '%s'." +#~ msgstr "An error occurred when pulling snapshot '%s'." -#~ msgid "Unable to make a proper backup. TAR was terminated." -#~ msgstr "Unable to make a proper backup. TAR was terminated." +#, python-format +#~ msgid "Base of snapshot '%s' is not set." +#~ msgstr "Base of snapshot '%s' is not set." -#~ msgid "" -#~ "This dialogue helps you to manage your configuration profiles. You can set " -#~ "up a number of configuration profiles that will be run by sbackup when it " -#~ "starts the backup. Thanks to this you can configure backups of different " -#~ "kinds to different places." -#~ msgstr "" -#~ "This dialogue helps you to manage your configuration profiles. You can set " -#~ "up a number of configuration profiles that will be run by sbackup when it " -#~ "starts the backup. Thanks to this you can configure backups of different " -#~ "kinds to different places." +#, python-format +#~ msgid "Cancelling pull of snapshot '%s'" +#~ msgstr "Cancelling pull of snapshot '%s'" -#~ msgid "" -#~ "Choose the compression format that you want to apply.\n" -#~ "Default is gzip." -#~ msgstr "" -#~ "Choose the compression format that you want to apply.\n" -#~ "Default is gzip." +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "Upgrading from v1.0 to v1.2: %s" -#~ msgid "" -#~ "Split the backup archive into small pieces (value in MiB).\n" -#~ "Important note: This functionality is not compatible with compressed " -#~ "backups!" -#~ msgstr "" -#~ "Split the backup archive into small pieces (value in MiB).\n" -#~ "Important note: This functionality is not compatible with compressed " -#~ "backups!" +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "Upgrading to v1.3: %s" -#~ msgid "Remote paths" -#~ msgstr "Remote paths" +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "Upgrading to v1.4: %s" -#~ msgid "" -#~ "Using this window you can manage your backups, restore them, revert an " -#~ "existing directory to a previous state..." -#~ msgstr "" -#~ "Using this window you can manage your backups, restore them, revert an " -#~ "existing directory to a previous state..." +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "Upgrading to v1.5: %s" -#~ msgid "" -#~ "Select the directory in which you have your backups.\n" -#~ "You can use a local or distant directory depending on the " -#~ "plugins you have installed." +#, python-format +#~ msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." #~ msgstr "" -#~ "Select the directory in which you have your backups.\n" -#~ "You can use a local or distant directory depending on the plug-" -#~ "ins you have installed." - -#~ msgid "Use the default directory : " -#~ msgstr "Use the default directory : " - -#~ msgid "Use a custom directory : " -#~ msgstr "Use a custom directory : " +#~ "The SNAR file already exist for snapshot '%s'. It is not overwritten." -#~ msgid "Snapshots directory" -#~ msgstr "Snapshots directory" +#~ msgid "The version of the snapshot is greater than the supported one!" +#~ msgstr "The version of the snapshot is greater than the supported one!" -#~ msgid "Restore As" -#~ msgstr "Restore As" +#~ msgid "Unable to upgrade snapshot" +#~ msgstr "Unable to upgrade snapshot" -#~ msgid "Revert As" -#~ msgstr "Revert As" - -#~ msgid "Choose to upgrade your snapshot if needed." -#~ msgstr "Choose to upgrade your snapshot if needed." +#, python-format +#~ msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" +#~ msgstr "Do you really want to rebase '%(current)s' on '%(base)s' ?" -#~ msgid "Actual base :" -#~ msgstr "Actual base :" +#, python-format +#~ msgid "File '%(file)s' does not exist." +#~ msgstr "File '%(file)s' does not exist." -#~ msgid "Select a snapshot and change its base to another snapshot." -#~ msgstr "Select a snapshot and change its base to another snapshot." +#~ msgid "Upgrade" +#~ msgstr "Upgrade" diff -Nru sbackup-0.11.4/po/en_GB.po sbackup-0.11.6/po/en_GB.po --- sbackup-0.11.4/po/en_GB.po 2011-02-13 18:22:17.000000000 +0100 +++ sbackup-0.11.6/po/en_GB.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" -"PO-Revision-Date: 2010-12-14 18:25+0000\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" +"PO-Revision-Date: 2011-02-06 11:37+0000\n" "Last-Translator: starmaker \n" "Language-Team: English (United Kingdom) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "SBackup Daemon <%(login)s@%(hostname)s>" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "[SBackup] [%(profile)s] Report of %(date)s" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "No log file specified." @@ -45,27 +45,27 @@ "\n" "Now continue processing remaining profiles." -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "Backup was cancelled by user." -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "Beim Abbruch der Sicherung trat ein Fehler auf:" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "Während der Sicherung trat ein Fehler auf:" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "Fehler beim Sender der E-Mail:" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "The following error(s) occurred before:" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" @@ -74,7 +74,7 @@ "Sicherung wurde nicht gestartet.\n" "%s" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " @@ -84,25 +84,29 @@ "want to help by submitting bugs, by translating or anything else please " "visit our website." -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "Maintainers:" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "Former maintainers:" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "Contributors:" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "translator-credits\n" "\n" "Launchpad Contributions:\n" +" Alessio Treglia https://launchpad.net/~quadrispro\n" +" David Kovar https://launchpad.net/~kowy\n" " Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" +" John Drinkwater https://launchpad.net/~johndrinkwater\n" +" Sohrab https://launchpad.net/~sohrab-naushad\n" " ciaran.mooney https://launchpad.net/~ciaran-mooney\n" " starmaker https://launchpad.net/~hernaninverso\n" " toomuch https://launchpad.net/~toomuch" @@ -117,58 +121,58 @@ msgid "Effective path for `%s` is not available" msgstr "Effective path for `%s` is not available" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "Unable to get effective path for `%s`" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" "For the moment split functionality is not compatible with compress option." -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "Unable to change permissions for file '%s'." -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "Unable to remove temporary file `%(file)s`: %(error)s" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "Launching TAR to make incremental backup." -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "Unable to find the SNAR file to make an incremental backup." -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "Falling back to full backup." -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "Launching TAR to make a full backup." -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "Leading '/' from member names were removed." -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "Leading '/' from hard link targets were removed." -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "TAR returned a message: %s" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" @@ -177,16 +181,16 @@ "TAR devolvió un mensaje:\n" "%s" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "TAR has been finished successfully." -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "TAR returned a warning: %s" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" @@ -195,58 +199,58 @@ "TAR returned warnings:\n" "%s" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "TAR devolvió advertencias pero ha finalizado satisfactoriamente." -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "Imposible completar satisfactoriamente. TAR finaizó con errores." -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "Unable to terminate backend process: %s" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "Included" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "Not changed" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "Directory" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "Line must be a string" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "Dumpdir inconsistency : 'filename' is empty" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "Dumpdir inconsistency : 'control' is empty" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "File '%s' does not exist." -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "The snarfile header is incomplete." -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "A SnapshotFile is required" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "Directory does not exist: %s." @@ -278,6 +282,11 @@ "\n" "Please check your configuration file." msgstr "" +"Error while processing configuration:\n" +"\n" +"%(error)s in line `%(line)s`.\n" +"\n" +"Please check your configuration file." #: src/sbackup/core/ConfigManager.py:588 src/sbackup/core/ConfigManager.py:622 #, python-format @@ -365,65 +374,65 @@ "When specifying a SSL certificate or key file, a key file resp. certificate " "is mandatory." -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Default Profile" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Unknown Profile" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "Unlimited" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "100 MiB" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "250 MiB" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "650 MiB" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "2 GiB (FAT16)" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "4 GiB (FAT32)" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Custom" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3 Music" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI Video" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG Video" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matroska Video" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "Ogg Multimedia container" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "CD Images" @@ -441,228 +450,153 @@ "File '%(filename)s' not found in snapshot's [%(snapshotname)s] files list. " "File skipped." -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "Snapshot '%s' not found " -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "Invalid snapshot `%(name)s` found: Name of snapshot not valid." -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "Invalid snapshot `%(name)s` found: %(error_cause)s." -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "No need to rebase a full snapshot '%s'" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "Rebasing '%(current)s' on '%(base)s'" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "An error occurred when pulling snapshot '%s'." - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "The snarfile header is incomplete !" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "Base of snapshot '%s' is not set." - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "Cancelling pull of snapshot '%s'" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "Unable to remove upgrade stamp: %s" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "Upgrading from v1.0 to v1.2: %s" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "Upgrading to v1.3: %s" - -#: src/sbackup/core/UpgradeManager.py:229 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.4: %s" -msgstr "Upgrading to v1.4: %s" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "Upgrading to v1.5: %s" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." +msgid "Running of hooks: %s" msgstr "" -"The SNAR file already exist for snapshot '%s'. It is not overwritten." -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "Preparando el proceso de backup" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "Snapshot '%(name)s' is being made." -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "Setting Base to '%(value)s'." -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "Setting packages File." -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "Problem when setting the packages list: " -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "Setting Excludes File." -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "Formato de compresión configurado en `%s`" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "Setting size of archive chunks to %s" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "Option 'Follow symbolic links' is enabled." -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "Option 'Follow symbolic links' is disabled." -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "La copia instantánea está siendo realizada" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "Error al purgar copias instantáneas antiguas: %s" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "Backup process finished." -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "Inspeciona el sistema de archivos y colecta archivos info" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "Resumen del backup" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "Number of directories: %s." -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "Total number of files: %s." -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "Number of symlinks: %s." -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "Number of files included in snapshot: %s." -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "Number of new files (also included): %s." -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "Number of files skipped in incremental snapshot: %s." -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "Number of items forced to be excluded: %s." -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "Number of items to be excluded by config: %s." -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "Maximum free size required is '%s'." -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "Available disk size is '%s'." -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " @@ -671,74 +605,74 @@ "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "Unable to copy log. File access is not initialised." -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "Unable to copy log file: %s" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "Unable to find logfile to copy into snapshot." -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "No snapshot to copy logfile." -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "Processing of profile was cancelled on user request\n" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "Processing of profile successfully finished (no errors)\n" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "Processing of profile failed with error: %s\n" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "Backup destination: %s" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "Unable to find destination directory." -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "Unable to find destination directory even after retry." -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "Target directory '%(target)s' does not exist." -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "Unable to access destination: %s" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "Snapshot is inconsistent: __name is not set " -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "Name of snapshot '%s' doesn't match requirement" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "Snapshot is inconsistent: __snapshotpath is not set " -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " @@ -747,7 +681,7 @@ "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " @@ -756,26 +690,26 @@ "%(file)s does not contain valid value. Ignoring incomplete or non-backup " "directory. " -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "Name of Snapshot not valid : %s" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "Name of base not valid : %s" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "Invalid name of snapshot: %s" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "Unable to read mandatory file `ver`" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "Base name must be set for incremental backup." @@ -787,18 +721,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "Terminating FUSE File Access Manager." -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "SFTP" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "SSH" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "FTP" @@ -810,65 +744,70 @@ msgid "Terminating GIO File Access Manager." msgstr "Terminating GIO File Access Manager." -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "NFS" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "SMB" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" -msgstr "" +msgstr "Unable to get mount: path is not mounted" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" +"Unable to get mount: path not found when mounting (is probably local)" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" -msgstr "" +msgstr "Unable to get mount: %s" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "Unable to un-set mount flag: path is not stored" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "Path is already mounted." -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "Path is not mounted." -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "Test specified path for existence using GIO" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "Create testdir" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "Test testfile for existence" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "Create file" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "Re-read test file" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "Remove file" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "Remove dir" @@ -978,8 +917,7 @@ "\n" "%s." -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "Simple Backup error" @@ -1067,6 +1005,13 @@ "\n" "Important note: Saving will overwrite your existing invalid configuration." msgstr "" +"%s\n" +"\n" +"A backup profile using default values was created. Save the new " +"configuration in order to use it or check your existing configuration file " +"manually.\n" +"\n" +"Important note: Saving will overwrite your existing invalid configuration." #: src/sbackup/ui/configgui.py:641 #, python-format @@ -1328,33 +1273,33 @@ msgid "there was a problem initializing the pynotify module" msgstr "There was a problem initializing the pynotify module" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "Connection to notification-daemon failed: %s" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "Simple Backup" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "Show message windows" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "Cancel Backup" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "Connection to D-Bus service lost." -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "Re-connection was successful" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." @@ -1362,32 +1307,24 @@ "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "Starting backup session" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "Ending backup session" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "Unknown D-Bus event `%s` received." -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "Try again" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." @@ -1395,65 +1332,65 @@ "Attempt at starting another instance of Simple Backup while this one is " "already running." -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "Unable to present window: %s" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "Do you really want to cancel the backup process of profile '%s'?" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "Cancel running backup process?" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "Unable to cancel backup process." -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "Profile: %s" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "Size of backup: %s" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "%.1f%% processed" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "Remaining time: %s" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "PID of backup process being canceled: %s" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "Unable to send signal to process %s" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "Sending signal using gksu to process %s" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "Sending signal using gksu to process %s failed" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1466,77 +1403,79 @@ "The specified target directory '%s' was not found.\n" "\n" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" +"You can try to use the specified target again or cancel the profile " +"execution. The specified destination is automatically used in %s seconds." -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "unknown" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "less than 1 minute" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "about 2 minutes" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "about 3 minutes" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "about 4 minutes" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "about 5 minutes" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "about %.0f minutes" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "In progress" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "finished" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "Progress: unknown" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "Backup is being prepared" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "Collecting file info" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "Progress: canceled" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "An error occurred" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "Another `Simple Backup Indicator` is already running." -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "Initialization of GTK+ failed: %s" @@ -1571,7 +1510,7 @@ msgid "Restore..." msgstr "Restore..." -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "Restore as..." @@ -1579,12 +1518,12 @@ msgid "Revert..." msgstr "Revert..." -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "Revert as..." #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "n.a." @@ -1660,14 +1599,12 @@ msgid "No backups found for this day." msgstr "No backups found for this day." -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" -"Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " #: src/sbackup/ui/restoregui.py:643 msgid "Select restore location" @@ -1692,66 +1629,6 @@ msgstr "Reading snapshot..." #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "The version of the snapshot is greater than the supported one!" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "Do you really want to upgrade snapshot?" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "Upgrade snapshot '%s'" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "Snapshot was sucessfully upgraded." - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "Simple Backup upgrade" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "Upgrade finished" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "Unable to upgrade snapshot" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "Do you really want to rebase '%(current)s' on '%(base)s' ?" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1764,11 +1641,11 @@ "\n" "Are you sure that you want to remove the snapshot permanently?" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "Do you really want to remove snapshot?" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" @@ -1777,11 +1654,11 @@ "While attempting to delete snapshot the following error occurred:\n" "%s" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "Unable to delete snapshot" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1794,35 +1671,35 @@ "\n" "Remove all of these child snapshots in order to delete this snapshot." -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "Unable to remove snapshot" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "Termination in progress" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "Simple Backup restoration" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "Restoring of selected files" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "Restoring of '%s' is in progress." -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "Restoring of '%s' was successful." -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1833,7 +1710,7 @@ "\n" "Following error occurred:\n" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1842,7 +1719,7 @@ "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1851,7 +1728,7 @@ "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1864,21 +1741,21 @@ "\n" "Following error occurred:\n" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "Reverting selected files" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "Reverting of '%s' is in progress.\n" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "Reverting of '%s' was successful." -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1889,7 +1766,7 @@ "\n" "Following error occurred:\n" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1898,7 +1775,7 @@ "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1907,7 +1784,7 @@ "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1942,70 +1819,65 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "File '%(file)s' does not exist." - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "File '%(file)s' is not accessible with error '%(error)s'." -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" "File '%(file)s' cannot be opened for read access. Operation timed out." -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." -#: src/sbackup/util/filecollect.py:385 -#, python-format -msgid "File '%(file)s' is backup's target directory." -msgstr "File '%(file)s' is backup's target directory." - -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:372 #, python-format msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." -msgstr "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "File '%(file)s' is backup's target directory." +msgstr "File '%(file)s' is backup's target directory." + +#: src/sbackup/util/filecollect.py:393 +#, python-format +msgid "Path '%(file)s' defined in excludes list." +msgstr "Path '%(file)s' defined in excludes list." -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "File '%(file)s' matches regular expression '%(regex)s'." -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." -msgstr "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgstr "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "Error while checking directory '%(dir)s': %(error)s." -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "Empty regular expression found. Skipped." -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "Invalid regular expression ('%s') found. Skipped." -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "No directories to backup defined." @@ -2579,12 +2451,61 @@ #: data/ui/sbackup-config.glade:4217 msgid "_Connect" -msgstr "" +msgstr "_Connect" #: data/ui/sbackup-config.glade:4293 msgid "Make a full backup" msgstr "Make a full backup" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Restore files/directories" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Restore Source Folder" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Available backups:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Use custom:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Use default:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Files and Folders to restore" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Restore" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Restore As..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "Backup destination" @@ -2641,245 +2562,199 @@ msgid "Delete" msgstr "Delete" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "Upgrade snapshot" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "Upgrade" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "Snapshot History" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" -msgstr "" +msgstr "Current base:" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "Select a snapshot on this list to rebase on it." -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "Rebase" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "Snapshot Management" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" -msgstr "" +msgstr "Snapshot details" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" -msgstr "" +msgstr "Restores files/directories from the selected snapshot" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Restore" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" +"Restores files/directories recursively starting from the base snapshot to " +"the selected snapshot" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "Revert" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "Restoration Management" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "Export Management" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "Headline" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "Content" -#~ msgid "(Not So) Simple Backup error" -#~ msgstr "(Not So) Simple Backup error" - -#~ msgid "sbackup restoration" -#~ msgstr "sbackup restoration" - -#~ msgid "Import of module 'pynotify' failed with error: %s." -#~ msgstr "Import of module 'pynotify' failed with error: %s." - -#~ msgid "Failed to set the gid to 'admin' one :" -#~ msgstr "Failed to set the gid to 'admin' one :" - -#~ msgid "Setting split size." -#~ msgstr "Setting split size." - -#~ msgid "Target not writeable: " -#~ msgstr "Target not writeable: " - -#~ msgid "Invalid value of the target directory : " -#~ msgstr "Invalid value of the target directory : " +#, python-format +#~ msgid "No need to rebase a full snapshot '%s'" +#~ msgstr "No need to rebase a full snapshot '%s'" +#, python-format #~ msgid "" -#~ "Got a non valid snapshot '%(name)s' due to name convention : %(error_cause)s " +#~ "'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " #~ msgstr "" -#~ "Got a non valid snapshot '%(name)s' due to name convention : %(error_cause)s " - -#~ msgid "Deleting snapshot: '%(snp)s'." -#~ msgstr "Deleting snapshot: '%(snp)s'." - -#~ msgid "Cannot downgrade other format than 'gzip' to 1.4" -#~ msgstr "Cannot downgrade other format than 'gzip' to 1.4" +#~ "'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " +#, python-format #~ msgid "" -#~ "A backup run is initiated in the background.\n" -#~ "The process id is: %s." +#~ "Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " +#~ "'%(NewBaseSnapshot)s' " #~ msgstr "" -#~ "A backup run is initiated in the background.\n" -#~ "The process id is: %s." +#~ "Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " +#~ "'%(NewBaseSnapshot)s' " -#~ msgid "Test on '%s' didn't succeed!" -#~ msgstr "Test on '%s' didn't succeed!" +#, python-format +#~ msgid "Rebasing '%(current)s' on '%(base)s'" +#~ msgstr "Rebasing '%(current)s' on '%(base)s'" -#~ msgid "'%d' test(s) didn't succeed !" -#~ msgstr "'%d' test(s) didn't succeed !" +#, python-format +#~ msgid "An error occurred when pulling snapshot '%s'." +#~ msgstr "An error occurred when pulling snapshot '%s'." -#~ msgid "Test Succeeded !" -#~ msgstr "Test Succeeded !" +#, python-format +#~ msgid "Base of snapshot '%s' is not set." +#~ msgstr "Base of snapshot '%s' is not set." -#~ msgid "Target directory is writable." -#~ msgstr "Target directory is writable." +#, python-format +#~ msgid "Cancelling pull of snapshot '%s'" +#~ msgstr "Cancelling pull of snapshot '%s'" -#~ msgid "" -#~ "Please change target directory and test writability of the target directory " -#~ "by pressing \"Test\" button on the right." -#~ msgstr "" -#~ "Please change target directory and test writeability of the target directory " -#~ "by pressing \"Test\" button on the right." +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "Upgrading from v1.0 to v1.2: %s" -#~ msgid "remove" -#~ msgstr "remove" +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "Upgrading to v1.3: %s" -#~ msgid "disable" -#~ msgstr "disable" +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "Upgrading to v1.4: %s" -#~ msgid "" -#~ "You can't %s the Default Profile. Please use it if you need only one profile." -#~ msgstr "" -#~ "You can't %s the Default Profile. Please use it if you need only one profile." +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "Upgrading to v1.5: %s" -#~ msgid "" -#~ "The program is going to be terminated. Please make sure the missing " -#~ "directory exists (e.g. by mounting an external disk) or change the specified " -#~ "target in '(Not So) Simple Backup-Configuration' tool and restart this " -#~ "application." +#, python-format +#~ msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." #~ msgstr "" -#~ "The program is going to be terminated. Please make sure the missing " -#~ "directory exists (e.g. by mounting an external disk) or change the specified " -#~ "target in '(Not So) Simple Backup-Configuration' tool and restart this " -#~ "application." +#~ "The SNAR file already exist for snapshot '%s'. It is not overwritten." -#~ msgid "An error occurred during initialization:" -#~ msgstr "An error occurred during initialisation:" +#~ msgid "The version of the snapshot is greater than the supported one!" +#~ msgstr "The version of the snapshot is greater than the supported one!" -#~ msgid "Actual base : %s" -#~ msgstr "Actual base : %s" +#~ msgid "Unable to upgrade snapshot" +#~ msgstr "Unable to upgrade snapshot" -#~ msgid "(Not So) Simple Backup restoration error" -#~ msgstr "(Not So) Simple Backup restoration error" - -#~ msgid "" -#~ "Are you sure that you want to remove snapshot '%s'?\n" -#~ "\n" -#~ "This may take a while - be patient." -#~ msgstr "" -#~ "Are you sure that you want to remove snapshot '%s'?\n" -#~ "\n" -#~ "This may take a while - be patient." - -#~ msgid "The mandatory 'ver' file doesn't exist in [%s]." -#~ msgstr "The mandatory 'ver' file doesn't exist in [%s]." +#, python-format +#~ msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" +#~ msgstr "Do you really want to rebase '%(current)s' on '%(base)s' ?" -#~ msgid "Command 'env' failed." -#~ msgstr "Command 'env' failed." +#, python-format +#~ msgid "File '%(file)s' does not exist." +#~ msgstr "File '%(file)s' does not exist." -#~ msgid "Unable to make a proper backup. TAR was terminated." -#~ msgstr "Unable to make a proper backup. TAR was terminated." +#~ msgid "Upgrade" +#~ msgstr "Upgrade" #~ msgid "" -#~ "This dialogue helps you to manage your configuration profiles. You can set " -#~ "up a number of configuration profiles that will be run by sbackup when it " -#~ "starts the backup. Thanks to this you can configure backups of different " -#~ "kinds to different places." +#~ "There are snapshots stored in outdated snapshot formats. Please upgrade them " +#~ "using 'Simple Backup-Restoration' if you want to use them." #~ msgstr "" -#~ "This dialogue helps you to manage your configuration profiles. You can set " -#~ "up a number of configuration profiles that will be run by sbackup when it " -#~ "starts the backup. Thanks to this you can configure backups of different " -#~ "kinds to different places." +#~ "There are snapshots stored in outdated snapshot formats. Please upgrade them " +#~ "using 'Simple Backup-Restoration' if you want to use them." + +#, python-format +#~ msgid "Unable to remove upgrade stamp: %s" +#~ msgstr "Unable to remove upgrade stamp: %s" #~ msgid "" -#~ "Choose the compression format that you want to apply.\n" -#~ "Default is gzip." +#~ "There are snapshots with old snapshot format. Please upgrade these using the " +#~ "Restoration tool if you want to use them." #~ msgstr "" -#~ "Choose the compression format that you want to apply.\n" -#~ "Default is gzip." +#~ "There are snapshots with old snapshot format. Please upgrade these using the " +#~ "Restoration tool if you want to use them." +#, python-format #~ msgid "" -#~ "Split the backup archive into small pieces (value in MiB).\n" -#~ "Important note: This functionality is not compatible with compressed " -#~ "backups!" +#~ "Upgrading the selected snapshot `%s` might corrupt your backup for this " +#~ "particular point in time. You cannot undo this operation. It is recommended " +#~ "to create a copy of the snapshot directory before upgrading it. The upgrade " +#~ "process takes a while - be patient.\n" +#~ "\n" +#~ "Are you sure that you want to upgrade the snapshot now?" #~ msgstr "" -#~ "Split the backup archive into small pieces (value in MiB).\n" -#~ "Important note: This functionality is not compatible with compressed " -#~ "backups!" +#~ "Upgrading the selected snapshot `%s` might corrupt your backup for this " +#~ "particular point in time. You cannot undo this operation. It is recommended " +#~ "to create a copy of the snapshot directory before upgrading it. The upgrade " +#~ "process takes a while - be patient.\n" +#~ "\n" +#~ "Are you sure that you want to upgrade the snapshot now?" -#~ msgid "Remote paths" -#~ msgstr "Remote paths" +#~ msgid "Do you really want to upgrade snapshot?" +#~ msgstr "Do you really want to upgrade snapshot?" +#, python-format #~ msgid "" -#~ "Using this window you can manage your backups, restore them, revert an " -#~ "existing directory to a previous state..." +#~ "Snapshot version is not supported (Only %(supportedversion)s is supported). " +#~ "Version '%(currentversion)s' found. You should upgrade it. " #~ msgstr "" -#~ "Using this window you can manage your backups, restore them, revert an " -#~ "existing directory to a previous state..." +#~ "Snapshot version is not supported (Only %(supportedversion)s is supported). " +#~ "Version '%(currentversion)s' found. You should upgrade it. " +#~ msgid "Simple Backup upgrade" +#~ msgstr "Simple Backup upgrade" + +#, python-format #~ msgid "" -#~ "Select the directory in which you have your backups.\n" -#~ "You can use a local or distant directory depending on the " -#~ "plugins you have installed." +#~ "While attempting to upgrade snapshot the following error occurred:\n" +#~ "%s" #~ msgstr "" -#~ "Select the directory in which you have your backups.\n" -#~ "You can use a local or distant directory depending on the plug-" -#~ "ins you have installed." - -#~ msgid "Use the default directory : " -#~ msgstr "Use the default directory : " - -#~ msgid "Use a custom directory : " -#~ msgstr "Use a custom directory : " +#~ "While attempting to upgrade snapshot the following error occurred:\n" +#~ "%s" -#~ msgid "Snapshots directory" -#~ msgstr "Snapshots directory" - -#~ msgid "Restore As" -#~ msgstr "Restore As" - -#~ msgid "Revert As" -#~ msgstr "Revert As" +#, python-format +#~ msgid "Upgrade snapshot '%s'" +#~ msgstr "Upgrade snapshot '%s'" -#~ msgid "Choose to upgrade your snapshot if needed." -#~ msgstr "Choose to upgrade your snapshot if needed." +#~ msgid "Snapshot was sucessfully upgraded." +#~ msgstr "Snapshot was sucessfully upgraded." -#~ msgid "Actual base :" -#~ msgstr "Actual base :" +#~ msgid "Upgrade finished" +#~ msgstr "Upgrade finished" -#~ msgid "Select a snapshot and change its base to another snapshot." -#~ msgstr "Select a snapshot and change its base to another snapshot." +#~ msgid "Upgrade snapshot" +#~ msgstr "Upgrade snapshot" diff -Nru sbackup-0.11.4/po/es.po sbackup-0.11.6/po/es.po --- sbackup-0.11.4/po/es.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/es.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" -"PO-Revision-Date: 2010-12-22 06:40+0000\n" -"Last-Translator: Jorge Prediger \n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" +"PO-Revision-Date: 2012-02-22 19:44+0000\n" +"Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,9 +27,9 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "[SBackup] [%(profile)s] Reporte del %(date)s" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." -msgstr "No se especifico un archivo de registro." +msgstr "No se especificó un archivo de registro." #: src/sbackup/backupproc.py:183 msgid "Unable to find log file." @@ -42,29 +42,29 @@ "Now continue processing remaining profiles." msgstr "" "Error crítico: ¡no se ha encontrado el archivo de configuración para el " -"perfil por defecto!" +"perfil predeterminado!" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "Copia de seguridad cancelada por el usuario." -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "Se produjo un error durante la cancelación de copia de seguridad:" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" -msgstr "Ocurrió un error durante la copia de seguridad:" +msgstr "Ocurrió un error durante el respaldo:" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "Error al enviar el correo electrónico:" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "Ocurrieron el/los siguiente(s) errores antes de:" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" @@ -73,33 +73,52 @@ "La copia de seguridad no se ha iniciado.\n" "%s" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" +"Esta es una solución de copias de seguridad amigable para las necesidades " +"comunes de los equipos de escritorio. Si desea ayudar reportando errores, " +"mediante la traducción o cualquier otra cosa por favor visite nuestro sitio " +"web." -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" -msgstr "Encargados de mantenimiento:" +msgstr "Desarrolladores principales:" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" -msgstr "" +msgstr "Mantenedores anteriores" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "Colaboradores:" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "traductor-créditos\n" "\n" "Launchpad Contributions:\n" +" Adolfo Jayme Barrientos https://launchpad.net/~fitoschido\n" +" Daniel Bernal https://launchpad.net/~afterxleep.-\n" +" Emilio Vega Roa https://launchpad.net/~tehxnik\n" +" Gonzalo L. Campos Medina https://launchpad.net/~gcamposm\n" +" Horacio Arroyo https://launchpad.net/~deblike\n" +" Ignacio Hidalgo https://launchpad.net/~hipernacho\n" +" Javier García Díaz https://launchpad.net/~jgd\n" " Jorge Prediger https://launchpad.net/~jorgeprediger\n" -" Paco Molinero https://launchpad.net/~franciscomol" +" Marcelo Kobs https://launchpad.net/~kobops\n" +" Oscar Soto https://launchpad.net/~oscarfsoto\n" +" Paco Molinero https://launchpad.net/~franciscomol\n" +" Ricardo Pérez López https://launchpad.net/~ricardo\n" +" Roberto Serrano Diaz-Grande https://launchpad.net/~robertoserrano83\n" +" Rodrigo Jose Luis Brun Vera https://launchpad.net/~rodrigolbrunv\n" +" adn https://launchpad.net/~adn-throatwobblermangrove\n" +" nh3oh https://launchpad.net/~nh3oh-com1\n" +" Ángel Eduardo https://launchpad.net/~arcnor" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -109,60 +128,62 @@ #: src/sbackup/ar_backend/tar.py:123 #, python-format msgid "Effective path for `%s` is not available" -msgstr "" +msgstr "La ruta efectiva para «%s» no esta disponible" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" -msgstr "" +msgstr "Imposible de obtener una dirección efectiva para «%s»" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" +"Por el momento la funcionalidad de cortar no es compatible con la opción de " +"compresión." -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." -msgstr "No se pudieron cambiar los permisos del archivo '%s'" +msgstr "No se pudieron cambiar los permisos del archivo «%s»" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" -msgstr "" +msgstr "No se pudo eliminar el archivo temporal «%(file)s»: %(error)s" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "Ejecutando TAR para realizar respaldo incremental." -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" "No se pudo encontrar el archivo SNAR para realizar un respaldo incremental." -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." -msgstr "" +msgstr "Retroceder a copia de seguridad completa." -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." -msgstr "Ejecutando TAR para realizar respaldo completo." +msgstr "Lanzando TAR para realizar Copia de respaldo completa" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." -msgstr "" +msgstr "El carácter «/» de los nombres de los miembros fueron retirados." -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." -msgstr "" +msgstr "El carácter «/» de los enlaces fijos se eliminó" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "TAR ha devuelto un mensaje: %s" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" @@ -171,76 +192,76 @@ "TAR ha devuelto estos mensajes:\n" "%s" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." -msgstr "TAR ha terminado exitosamente." +msgstr "TAR ha terminado correctamente." -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" -msgstr "TAR devolvió una advertencia: %s" +msgstr "TAR devolvió un aviso: %s" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -"TAR devolvió estas advertencias:\n" +"Avisos de TAR:\n" "%s" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." -msgstr "TAR devolvió advertencias pero finalizo con éxito." +msgstr "TAR devolvió avisos pero finalizó correctamente." -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "No se pudo finalizar correctamente. TAR finalizo con errores." -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" -msgstr "" +msgstr "Imposible de terminar un proceso interno : %s" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "Incluido" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "Sin cambios" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "Directorio" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "La línea ha de ser una cadena" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" -msgstr "Directorio de Dump inconsistente : 'filename' esta vacio" +msgstr "Directorio de volcado inconsistente : «filename» esta vacio" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" -msgstr "Directorio de Dump inconsistente : 'control' esta vacio" +msgstr "Directorio de volcado inconsistente : «control» esta vacio" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." -msgstr "El archivo '%s' no existe" +msgstr "El archivo «%s» no existe" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." -msgstr "" +msgstr "La cabecera del archivo SNAR esta incompleta." -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "Se requiere un archivo de instantánea" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "El directorio no existe: %s." @@ -249,7 +270,7 @@ #, python-format msgid "Profile settings are being read from file '%s'." msgstr "" -"Las configuraciones del perfil se están leyendo desde el archivo '%s'." +"Las configuraciones del perfil se están leyendo desde el archivo «%s»." #: src/sbackup/core/ConfigManager.py:333 #, python-format @@ -257,10 +278,12 @@ "Profile settings are being set to default values. Configuration file is set " "to '%s'." msgstr "" +"La configuración del perfil se ajusta a los valores predeterminados. El " +"archivo de configuración se establece en «%s»." #: src/sbackup/core/ConfigManager.py:479 msgid "Option 'target' is missing, aborting." -msgstr "No se encuentra la opcion 'destino', abortando." +msgstr "Falta la opción «destino» , abortando." #: src/sbackup/core/ConfigManager.py:547 #, python-format @@ -271,19 +294,26 @@ "\n" "Please check your configuration file." msgstr "" +"Error durante el procesamiento de la configuración:\n" +"\n" +"%(error)s en la linea «%(line)s».\n" +"\n" +"Por favor revise su archivo de configuración." #: src/sbackup/core/ConfigManager.py:588 src/sbackup/core/ConfigManager.py:622 #, python-format msgid "" "Unable to evaluate '%(parameter)s' as a dictionary (value got = '%(value)r')." msgstr "" +"Imposible de evaluar «%(parameter)s» como diccionario (valor obtenido = " +"«%(value)r»)." #: src/sbackup/core/ConfigManager.py:614 #, python-format msgid "" "Couldn't evaluate '%(parameter)s' as a dictionary (value got = '%(value)r' )" msgstr "" -"No se ha podido evluar '%(parameter)s' como diccionario (el valor tiene = " +"No se ha podido evluar '%(parameter)s' como diccionario (valor obtenido= " "'%(value)r' )" #: src/sbackup/core/ConfigManager.py:638 @@ -294,21 +324,25 @@ #, python-format msgid "Log output for [%(profile)s] is directed to file '%(file)s'." msgstr "" +"Salida del registro de eventos para [%(profile)s] fue direccionado al " +"archivo '%(file)s'." #: src/sbackup/core/ConfigManager.py:762 #, python-format msgid "Log output for [%s] is not directed into a file." -msgstr "" +msgstr "La salida del registro [%s] no fue direccionada al archivo." #: src/sbackup/core/ConfigManager.py:781 #, python-format msgid "Unable to rename log file '%(src)s'->'%(dst)s': %(err)s" msgstr "" +"Imposible de renombrar el archivo de registros de eventos '%(src)s'-" +">'%(dst)s': %(err)s" #: src/sbackup/core/ConfigManager.py:801 #, python-format msgid "The config file '%s' couldn't be read!" -msgstr "No se puede leer el arhcivo de configuración '%s'!" +msgstr "No se puede leer el arhivo de configuración «%s»!" #: src/sbackup/core/ConfigManager.py:813 #, python-format @@ -330,7 +364,7 @@ #: src/sbackup/core/ConfigManager.py:1163 msgid "No receiver set." -msgstr "" +msgstr "No hay ningún receptor establecido." #: src/sbackup/core/ConfigManager.py:1165 msgid "No SMTP server set." @@ -354,72 +388,78 @@ "set.\n" "Select SSL in order to use Certificate and Key." msgstr "" +"Un certificado y el archivo de licencia es dado mientras la opción de SSL " +"(smtptls=1) no ha sido agregado.\n" +"Seleccionar SSL en el orden para usar el certificado y el archivo de " +"licencia." #: src/sbackup/core/ConfigManager.py:1178 msgid "" "When specifying a SSL certificate or key file, a key file resp. certificate " "is mandatory." msgstr "" +"Cuando especifica un Certificado o un archivo de licencia, el archivo de " +"licencia responde.El certificado es obligatorio." -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Perfil predeterminado" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Perfil desconocido" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "Sin límite" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "100 MiB" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "250 MiB" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "650 MiB" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "2 GiB (FAT16)" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "4 GiB (FAT32)" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Personalizado" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Música MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "Vídeo AVI" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "Vídeo MPEG" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Vídeo Matrjoshka" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "Contenedor multimedia OGG" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Imágenes de CD" @@ -427,7 +467,7 @@ #, python-format msgid "File '%s' not found in the backup snapshot files list" msgstr "" -"Archivo '%s' no encontrado en la lista de archivos de la instantánea de la " +"Archivo «%s» no encontrado en la lista de archivos de la instantánea de la " "copia de seguridad" #: src/sbackup/core/RestoreManager.py:82 @@ -436,436 +476,381 @@ "File '%(filename)s' not found in snapshot's [%(snapshotname)s] files list, " "Skipped." msgstr "" +"Archivo '%(filename)s'no encontrado en la lista de archivos de la " +"instantánea [%(snapshotname)s] , Ignorado." -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " -msgstr "No se ha encontrado la instantánea '%s' " +msgstr "No se ha encontrado la instantánea «%s» " -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" +"Instantánea no valida `%(name)s` Encontrado: El nombre de la instantánea no " +"es valido." -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "No hay necesidad de rehacer un snapshot completo '%s'" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" -"'%(snapshotToRebase)s' no tiene un archivo 'base', puede estar roto " +msgstr "Instantánea no valida «%(name)s» Encontrado: %(error_cause)s." -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" -"No se puede rehacer un snapshot en uno mas nuevo : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "Ocurrió un error al tomar la instantánea '%s'." - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "¡La cabecera del archivo SNAR no está completa!" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." -msgstr "" +msgstr "La imagen'%s' esta llena, nada que ver (no se cambia esta llena)." -#: src/sbackup/core/SnapshotManager.py:824 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Cancelling pull of snapshot '%s'" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "Actualizando de v1.0 a v1.2: %s" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "Actualizando a v1.3: %s" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "Actualizando a v1.4: %s" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "Actualizando a v1.5: %s" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" -"El archivo SNAR ya existía en la instantánea '%s'. No se ha sobreescrito." - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "Preparación del proceso de copia de seguridad" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." -msgstr "" +msgstr "Se está haciendo la Instantánea '%(name)s'." -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." -msgstr "" +msgstr "Configurando Base a '%(value)s'." -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." -msgstr "" +msgstr "Configurando archivo de paquetes." -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "Hubo un problema al configurar la lista de paquetes: " -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." -msgstr "" +msgstr "Ajustes de archivos excluidos." -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" -msgstr "" +msgstr "Ajustes del formato de compresión para '%s'" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" -msgstr "" +msgstr "Ajustes del tamaño para partes de archivos para %s" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." -msgstr "" +msgstr "Opción 'Seguir links simbolicos' esta habilitada." -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." -msgstr "" +msgstr "La opción 'Seguir links simbólicos' esta deshabilitada." -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" -msgstr "" +msgstr "La instantanea está siendo confirmada" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" -msgstr "" +msgstr "Error mientras se limpiaban las instantáneas antiguas: %s" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "Ha finalizado el proceso de respaldo." -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" -msgstr "" +msgstr "Inspeccionando el sistema de archivos y recolectando información" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "Resumen de la copia de seguridad" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "Número de directorios: %s." -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "Número total de archivos: %s." -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "Número de enlaces simbólicos: %s." -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "Número de archivos incluidos en la instantánea: %s." -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "Número de archivos nuevos (también incluidos): %s." -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." -msgstr "" +msgstr "Número de archivos omitidos en la instantánea incremental: %s." -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." -msgstr "" +msgstr "Numero de elementos forzados a ser excluidos : %s." -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "Número de elementos excluidos por configuración: %s." -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." -msgstr "" +msgstr "El maximo tamaño libre requerido es «%s»." -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." -msgstr "El tamaño de disco disponible es '%s'." +msgstr "El tamaño de disco disponible es «%s»." -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" +"No hay suficiente espacio en el directorio elegido para la copia de " +"seguridad planeada(libre: %(freespace)s, requerido %(neededspace)s)." -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" +"Imposible de copiar el archivo de registros.El acceso al archivo no se fue " +"iniciado." -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" -msgstr "" +msgstr "Imposible de copiar el archivo de registros : %s" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -"Imposible encontrar el archivo de registro para copiar en la instananea." +"No se puede encontrar el archivo de registro para copiar en la imagen" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "No hay instantánea a la que copiar el archivo de registro." -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" -msgstr "" +msgstr "El procesamiento del perfil fue cancelado a petición del usuario\n" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" -msgstr "" +msgstr "El procesamiento del perfil termino exitosamente (No Hubo errores)\n" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" -msgstr "" +msgstr "El procesamiento del perfil fallo con error:%s\n" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" -msgstr "" +msgstr "Destino de la copia de seguridad: %s" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." -msgstr "" +msgstr "Imposible de encontrar el directorio de destino." -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" +"Imposible de encontrar el directorio de destino aun despues de reintentar." -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "No existe el directorio de destino '%(target)s'." -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" -msgstr "" +msgstr "Imposible de acceder al destino: %s" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " -msgstr "" +msgstr "La instantánea es inconsistente: _name no está definido " -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" -msgstr "El nombre de la instantánea '%s' no coincide con los requerimientos" +msgstr "El nombre de la instantánea «%s» no coincide con los requerimientos" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " -msgstr "" +msgstr "La instantánea es inconsistente: _snapshotpath no está definido " -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -"Se supone que el formato de compresión de la instantánea es '%s' pero no se " +"Se supone que el formato de compresión de la instantánea es «%s» pero no se " "encontró el archivo con un nombre correcto" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" +"%(file)s No contiene un valor valido. Ignorando incompleto o no existe el " +"directorio de la copia de seguridad. " -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "Nombre de instantánea no válido: %s" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "Nonbre de base no valido : %s" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" -msgstr "" +msgstr "Nombre invalido del snapshot: %s" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" -msgstr "" +msgstr "No se puede leer el archivo obligatorio 'ver'" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." -msgstr "" +msgstr "Un nombre base debe ser definido para respaldo incremental." #: src/sbackup/fs_backend/_fuse_fam.py:106 msgid "Initializing FUSE File Access Manager." -msgstr "" +msgstr "Inicializando el Manejador de Acceso a Archivos FUSE." #: src/sbackup/fs_backend/_fuse_fam.py:129 msgid "Terminating FUSE File Access Manager." -msgstr "" +msgstr "Finalizando el Manejador de Acceso a Archivos FUSE." -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" -msgstr "" +msgstr "SFTP" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" -msgstr "" +msgstr "SSH" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" -msgstr "" +msgstr "FTP" #: src/sbackup/fs_backend/_gio_fam.py:100 msgid "Initializing GIO File Access Manager." -msgstr "" +msgstr "Inicializando el Manejador de Acceso a Archivos GIO." #: src/sbackup/fs_backend/_gio_fam.py:114 msgid "Terminating GIO File Access Manager." +msgstr "Finalizando el Manejador de Acceso a Archivos GIO." + +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" -msgstr "" +msgstr "NFS" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" -msgstr "" +msgstr "SMB" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" -msgstr "" +msgstr "Imposible de montar: la ruta no fue montada" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" +"Imposible montar: No se encontró la ruta cuando se montó (probablemente es " +"local)" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" -msgstr "" +msgstr "Imposible de montar: %s" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" -msgstr "" +msgstr "No se puede montar el conjunto: la ruta no se almacena" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." -msgstr "" +msgstr "La ruta ya está montada." -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." -msgstr "" +msgstr "La ruta no está montada." -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" -msgstr "" +msgstr "prueba de ruta de acceso especificada usando GIO" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" -msgstr "" +msgstr "Crear directorio de prueba" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" -msgstr "" +msgstr "Prueba la existencia de archivo de prueba" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" -msgstr "" +msgstr "Crear archivo" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" -msgstr "" +msgstr "Releer archivo de prueba" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" -msgstr "" +msgstr "Eliminar archivo" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" -msgstr "" +msgstr "Eliminar directorio" #: src/sbackup/fuse_plugins/__init__.py:160 #, python-format msgid "Unable to import plugin `%(plugin_name)s`: %(error_cause)s " msgstr "" +"Imposible de importar complemento «%(plugin_name)s»: %(error_cause)s " #: src/sbackup/fuse_plugins/ftpFuseFAM.py:117 #, python-format @@ -873,18 +858,18 @@ "Couldn't found external application 'curlftpfs' needed for handling of ftp " "sites: %s" msgstr "" -"No se pudo encontrar la aplicación externa 'curlftpfs' requerida para tratar " +"No se pudo encontrar la aplicación externa «curlftpfs» necesaria para tratar " "con sitios FTP: %s" #: src/sbackup/fuse_plugins/ftpFuseFAM.py:127 #: src/sbackup/fuse_plugins/sftpFuseFAM.py:124 #, python-format msgid "Couldn't mount '%(server)s' into '%(mountpoint)s' : %(error)s" -msgstr "No se ha podido montar '%(server)s' en '%(mountpoint)s': %(error)s" +msgstr "No se ha podido montar «%(server)s» en «%(mountpoint)s»: %(error)s" #: src/sbackup/fuse_plugins/ftpFuseFAM.py:141 msgid "FTP schema is: ftp://user:pass@server/anything" -msgstr "" +msgstr "El esquema FTP es: ftp://user:pass@server/anything" #: src/sbackup/fuse_plugins/ftpFuseFAM.py:188 #, python-format @@ -892,8 +877,8 @@ "Error matching the schema 'ftp://user:pass@server/anything' with '%s' (The " "'/' after server is mandatory)" msgstr "" -"Error de concordancia del esquema 'ftp://user:pass@server/anything' con '%s' " -"(se requiere '/' después del nombre del servidor)" +"Error de concordancia del esquema «ftp://user:pass@server/anything» con «%s» " +"(se requiere «/» después del nombre del servidor)" #: src/sbackup/fuse_plugins/sftpFuseFAM.py:114 #, python-format @@ -901,6 +886,8 @@ "Couldn't found external application 'curlftpfs' needed for handling of sftp " "sites: %s" msgstr "" +"No se pudo encontrar una aplicación externa «curlftpfs» necesitado para el " +"manejo de los sitios sftp: %s" #: src/sbackup/fuse_plugins/sftpFuseFAM.py:138 msgid "SFTP schema is like : sftp://user:pass@server/anything" @@ -914,7 +901,7 @@ "'/' after server is mandatory)" msgstr "" "Error de concordancia del esquema 'sftp://user:pass@server/anything' con " -"'%s' (se requiere '/' después del nombre del servidor)" +"«%s» (se requiere '/' después del nombre del servidor)" #: src/sbackup/fuse_plugins/sshFuseFAM.py:81 #, python-format @@ -922,8 +909,8 @@ "Error matching the schema 'ssh://user:pass@example.com/home/' with '%s' (The " "'/' after server is mandatory)" msgstr "" -"Error de concordancia del esquema 'ssh://user:pass@server/anything' con '%s' " -"(se requiere '/' después del nombre del servidor)" +"Error de concordancia del esquema «ssh://user:pass@server/anything» con «%s» " +"(se requiere «/» después del nombre del servidor)" #: src/sbackup/fuse_plugins/sshFuseFAM.py:137 #, python-format @@ -931,10 +918,13 @@ "The sshfs command '%(command)s' didn't perform normally. Output => " "%(erroroutput)s " msgstr "" +"El comando sshfs '%(command)s' no se ejecutó en forma normal. Información de " +"salida => %(erroroutput)s " #: src/sbackup/fuse_plugins/sshFuseFAM.py:142 msgid "SSH schema is like : ssh://user:pass@example.com:33/home/user/backup/" msgstr "" +"El esquema SSH es como : ssh://user:pass@example.com:33/home/user/backup/" #: src/sbackup/fuse_plugins/sshFuseFAM.py:158 #, python-format @@ -948,6 +938,8 @@ "Please make sure the missing directory exists (e.g. by mounting an external " "disk) or change the specified target." msgstr "" +"Por favor, asegúrese de que el directorio perdido existe (p.ej. montando un " +"disco externo) o cambiando el destino especificado." #: src/sbackup/ui/GladeWindow.py:211 #, python-format @@ -956,19 +948,24 @@ "\n" "%s." msgstr "" +"Mientras se accedía al destino de la copia de seguridad, el siguiente error " +"ha ocurrido:\n" +"\n" +"%s." -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" -msgstr "" +msgstr "Error Simple Backup" #: src/sbackup/ui/GladeWindow.py:213 msgid "Unable to access backup destination" -msgstr "" +msgstr "Imposible de accede al destino de la copia de seguridad" #: src/sbackup/ui/configgui.py:125 msgid "Scheduled backups are available for Administrator users only." msgstr "" +"Las tareas programadas de copias de seguridad solamente están disponibles " +"para usuarios Administradores." #: src/sbackup/ui/configgui.py:135 src/sbackup/ui/configgui.py:144 msgid "Name" @@ -991,6 +988,8 @@ msgid "" "Invalid or empty regular expression ('%s') found in configuration. Removed." msgstr "" +"Invalida o vacia exprecion regular ('%s') encontrada en configuraciones. " +"Removida" #: src/sbackup/ui/configgui.py:292 #, python-format @@ -1002,6 +1001,9 @@ "These expressions are not used and were\n" "removed from the configuration." msgstr "" +"Invalida o vacia exprecion regular encontrada en las configuraciones:\n" +"'%s'\n" +"Estas expreciones no son usadas y fueron removidas de la configuracion." #: src/sbackup/ui/configgui.py:548 msgid "" @@ -1020,6 +1022,11 @@ "Attention: The target will be set to the default value. Check this on the " "destination settings page before saving the configuration." msgstr "" +"Destino de la copia de seguridad `%s` no existe.\n" +"\n" +"Atención: El destino será configurado a sus valor predeterminado. Revise " +"esto en la página de configuración de destino antes de guardar la " +"configuración." #: src/sbackup/ui/configgui.py:551 msgid "Unable to open backup target" @@ -1036,11 +1043,18 @@ "\n" "Important note: Saving will overwrite your existing invalid configuration." msgstr "" +"%s\n" +"\n" +"Un perfil de respaldo se ha creado usando los valores predeterminados. " +"Guarde la nueva configuración para utilizarla o revise manualmente su " +"archivo de configuración existente.\n" +"\n" +"Nota importante: Guardando sobrescribirá su configuración inválida existente." #: src/sbackup/ui/configgui.py:641 #, python-format msgid "Current profile: %s" -msgstr "" +msgstr "Perfil actual: %s" #: src/sbackup/ui/configgui.py:732 msgid "Already included item !" @@ -1069,10 +1083,12 @@ "It seems the path you entered does not exists. Do you want to add this " "incorrect path?" msgstr "" +"Parece que la ruta que ha ingresado no existe. Desea agregar esta ruta " +"incorrecta?" #: src/sbackup/ui/configgui.py:820 msgid "Save configuration as..." -msgstr "" +msgstr "Guardar configuración como..." #: src/sbackup/ui/configgui.py:887 msgid "" @@ -1081,46 +1097,52 @@ "You can monitor the progress of the backup by means of the status indicator " "displayed in the notification area." msgstr "" +"Un proceso de respaldo es ejecutado ahora en segundo plano.\n" +"\n" +"Puede monitorear el progreso de la copia de seguridad por medio del " +"notificador de estado mostrado en el área de notificación." #: src/sbackup/ui/configgui.py:888 msgid "Backup process started" -msgstr "" +msgstr "Proceso de copia de seguridad iniciado" #: src/sbackup/ui/configgui.py:893 src/sbackup/ui/configgui.py:1661 #: src/sbackup/ui/configgui.py:2038 #, python-format msgid "Unexpected dialog response: %s" -msgstr "" +msgstr "Respuesta de diálgo inesperada: %s" #: src/sbackup/ui/configgui.py:967 msgid "Include file..." -msgstr "" +msgstr "Incluir archivo..." #: src/sbackup/ui/configgui.py:974 src/sbackup/ui/configgui.py:1029 msgid "All files" -msgstr "Todos los ficheros" +msgstr "Todos los archivos" #: src/sbackup/ui/configgui.py:994 msgid "Include folder..." -msgstr "" +msgstr "Incluir directorio..." #: src/sbackup/ui/configgui.py:1022 msgid "Exclude file..." -msgstr "" +msgstr "Excluir archivo..." #: src/sbackup/ui/configgui.py:1045 msgid "Exclude folder..." -msgstr "" +msgstr "Excluir directorio..." #: src/sbackup/ui/configgui.py:1310 msgid "Configuration has changed" -msgstr "" +msgstr "La configuración ha cambiado" #: src/sbackup/ui/configgui.py:1311 msgid "" "There are unsaved modifications. Please save the configuration or revert " "these changes before testing the mail settings." msgstr "" +"Esas son modificaciones no guardadas. Por favor guardar la configuracion o " +"revertir aquellos cambios despues de testear la configuracion del email." #: src/sbackup/ui/configgui.py:1317 src/sbackup/ui/configgui.py:1323 msgid "Test mail settings" @@ -1128,11 +1150,11 @@ #: src/sbackup/ui/configgui.py:1318 msgid "The test failed with following output:" -msgstr "" +msgstr "La prueba falló con la siguiente información de salida:" #: src/sbackup/ui/configgui.py:1324 msgid "The test was successful." -msgstr "" +msgstr "La prueba se ha realizado correctamente." #: src/sbackup/ui/configgui.py:1407 src/sbackup/ui/configgui.py:1450 #, python-format @@ -1140,61 +1162,67 @@ "The given expression contains unsupported characters ('%s'). Currently it is " "not possible to use these characters in exclude expressions." msgstr "" +"La expresión dada contiene caracteres no soportados ('%s'). Actualmente no " +"es posible usar estos caracteres en expresiones de exclusión." #: src/sbackup/ui/configgui.py:1410 src/sbackup/ui/configgui.py:1453 msgid "Unsupported character" -msgstr "" +msgstr "Caracter no permitido" #: src/sbackup/ui/configgui.py:1621 msgid "Connect to remote destination" -msgstr "" +msgstr "Conectar a destino remoto" #: src/sbackup/ui/configgui.py:1669 msgid "Mount was sucessful (no errors)" -msgstr "" +msgstr "El montaje fue exitoso (no hubo errores)" #: src/sbackup/ui/configgui.py:1680 msgid "Unable to mount host" -msgstr "" +msgstr "Imposible de montar Host" #: src/sbackup/ui/configgui.py:1689 msgid "Umount was sucessful (no errors)" -msgstr "" +msgstr "El desmontaje fue exitoso (No hubo errores)" #: src/sbackup/ui/configgui.py:1699 msgid "Unable to unmount host" -msgstr "" +msgstr "Imposible de desmontar anfitrión" #: src/sbackup/ui/configgui.py:1729 msgid "Perfom tests on remote host" -msgstr "" +msgstr "Realizar pruebas en host remoto" #: src/sbackup/ui/configgui.py:1742 msgid "Unable to access remote destination" -msgstr "" +msgstr "Imposible acceder al destino remoto" #: src/sbackup/ui/configgui.py:1746 msgid "All tests passed" -msgstr "" +msgstr "Todas las pruebas fueron pasadas" #: src/sbackup/ui/configgui.py:1910 msgid "" "The given name of the new profile is empty. Please enter a valid profile " "name." msgstr "" +"El nombre dado al nuevo perfil esta vacio. Por favor ingrese un nombre de " +"perfil valido." #: src/sbackup/ui/configgui.py:1911 src/sbackup/ui/configgui.py:1918 msgid "Profile name not valid" -msgstr "" +msgstr "Nombre del perfil no válido" #: src/sbackup/ui/configgui.py:1917 msgid "" "The given name of the new profile already exists. Please enter another name." msgstr "" +"El nombre dado al nuevo perfil existe actualmente. Por favor ingrese otro " +"nombre." #: src/sbackup/ui/configgui.py:1919 msgid "Renaming of profiles is not supported." -msgstr "" +msgstr "El renombre de perfiles no esta soportado." #: src/sbackup/ui/configgui.py:1949 #, python-format @@ -1221,7 +1249,7 @@ #: src/sbackup/ui/configgui.py:2032 msgid "Default settings are being applied." -msgstr "" +msgstr "Valores por defecto siendo aplicados." #: src/sbackup/ui/configgui.py:2057 msgid "" @@ -1252,132 +1280,126 @@ #: src/sbackup/ui/configgui.py:2098 msgid "Please select a profile." -msgstr "" +msgstr "Por favor selecione un perfil." #: src/sbackup/ui/indicator_core.py:117 msgid "there was a problem initializing the pynotify module" -msgstr "" +msgstr "hubo un problema inicializando el módulo pynotify" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" -msgstr "" +msgstr "Fallo la conexión al servicio de notificación: %s" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" -msgstr "" +msgstr "Simple Backup" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" -msgstr "" +msgstr "Mostrar ventana de mensajes" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" -msgstr "" +msgstr "Copia de seguridad cancelada" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." -msgstr "" +msgstr "Se perdió la conexión con el servicio D-Bus." -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" -msgstr "" +msgstr "La reconeccion fue exitosa" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" -msgstr "" +msgstr "Iniciando sesión de copia de seguridad" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" -msgstr "" - -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" +msgstr "Finalizando sesión de copia de seguridad" -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" -msgstr "" +msgstr "Reintente" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" -msgstr "" +msgstr "No se puede presentar la ventana: %s" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" -msgstr "" +msgstr "Cancelar el proceso de copia de seguridad en ejecución?" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." -msgstr "" +msgstr "No se puede cancelar el proceso de copia de seguridad." -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" -msgstr "" +msgstr "Perfil: %s" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" -msgstr "" +msgstr "Tamaño de la copia de seguridad: %s" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" -msgstr "" +msgstr "%.1f%% procesados" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" -msgstr "" +msgstr "Tiempo restante: %s" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1386,85 +1408,85 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" -msgstr "" +msgstr "desconocido" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" -msgstr "" +msgstr "menos de 1 minuto" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" -msgstr "" +msgstr "cerca de 2 minutos" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" -msgstr "" +msgstr "cerca de 3 minutos" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" -msgstr "" +msgstr "cerca de 4 minutos" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" -msgstr "" +msgstr "cerca de 5 minutos" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" -msgstr "" +msgstr "cerca de %.0f minutos" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" -msgstr "" +msgstr "En curso" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" -msgstr "" +msgstr "terminado" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" -msgstr "" +msgstr "Progreso: desconocido" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" -msgstr "" +msgstr "Se esta preparando la copia de seguridad" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" -msgstr "" +msgstr "Recopilando información de aarchivo" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" -msgstr "" +msgstr "Progreso: cancelado" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" -msgstr "" +msgstr "Ocurrió un error" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" -msgstr "" +msgstr "La inicialización de GTK+ ha fallado: %s" #: src/sbackup/ui/misc.py:294 #, python-format msgid "%s (Administrator mode)" -msgstr "" +msgstr "%s (Modo administrador)" #: src/sbackup/ui/misc.py:324 #, python-format @@ -1479,13 +1501,13 @@ #: src/sbackup/ui/misc.py:325 msgid "Sorry, this should not have happened" -msgstr "" +msgstr "Esto no debería ocurrir" #: src/sbackup/ui/restoregui.py:78 msgid "Restore..." msgstr "Restaurar…" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "Restaurar como..." @@ -1493,14 +1515,14 @@ msgid "Revert..." msgstr "Revertir..." -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "Revertir como..." #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." -msgstr "" +msgstr "n.a." #: src/sbackup/ui/restoregui.py:146 src/sbackup/ui/restoregui.py:163 msgid "Snapshots" @@ -1520,11 +1542,11 @@ #: src/sbackup/ui/restoregui.py:187 msgid "Connect to destination..." -msgstr "" +msgstr "Conectar con destino..." #: src/sbackup/ui/restoregui.py:211 msgid "Specified path does not exist" -msgstr "" +msgstr "La ruta especificada no existe" #: src/sbackup/ui/restoregui.py:257 msgid "Ready" @@ -1532,7 +1554,7 @@ #: src/sbackup/ui/restoregui.py:371 msgid "No destination specified" -msgstr "" +msgstr "No se especifico un destino" #: src/sbackup/ui/restoregui.py:388 msgid "Choose a source folder" @@ -1540,11 +1562,11 @@ #: src/sbackup/ui/restoregui.py:405 msgid "Reading snapshots..." -msgstr "" +msgstr "Leyendo instantáneas..." #: src/sbackup/ui/restoregui.py:428 msgid "Reading directory content..." -msgstr "" +msgstr "Leyendo contenido del directorio..." #: src/sbackup/ui/restoregui.py:458 src/sbackup/ui/restoregui.py:496 msgid "Loading ..." @@ -1552,15 +1574,15 @@ #: src/sbackup/ui/restoregui.py:539 msgid "Reading files from snapshot..." -msgstr "" +msgstr "Leyendo archivos desde la instantánea..." #: src/sbackup/ui/restoregui.py:552 msgid "Simple Backup restore error" -msgstr "" +msgstr "Simple Backup error al restaurar" #: src/sbackup/ui/restoregui.py:553 msgid "An error occurred while reading snapshot" -msgstr "" +msgstr "Un error ocurrió mientras se leía la instantánea" #: src/sbackup/ui/restoregui.py:557 msgid "This snapshot seems empty." @@ -1572,13 +1594,13 @@ #: src/sbackup/ui/restoregui.py:599 msgid "No backups found for this day." -msgstr "" +msgstr "No se encontraron respaldos para este día" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1588,7 +1610,7 @@ #: src/sbackup/ui/restoregui.py:662 #, python-format msgid "Do you really want to revert '%s'?" -msgstr "" +msgstr "De verdad quieres volver a '%s'?" #: src/sbackup/ui/restoregui.py:676 msgid "Select revert location" @@ -1601,61 +1623,9 @@ #: src/sbackup/ui/restoregui.py:763 msgid "Reading snapshot..." -msgstr "" +msgstr "Leyendo instantánea..." #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "¡La versión de la instantánea es mayor que la soportada!" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "No se pudo actualizar la instantánea" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1664,22 +1634,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" -msgstr "" +msgstr "¿Quiere eliminar la instantánea?" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" -msgstr "" +msgstr "Imposible eliminar la instantánea" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1688,35 +1658,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" -msgstr "" +msgstr "No se puede eliminar la instantanea" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "Restauración de archivos seleccionados" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." -msgstr "La restauración de '%s' se está realizando." +msgstr "La restauración de «%s» se está realizando." -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1724,7 +1694,7 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1733,14 +1703,14 @@ "La restauración de '%(source)s'\n" "a '%(dirname)s' se está realizando." -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1749,21 +1719,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "Revertiendo archivos seleccionados" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" -msgstr "La reversión de '%s' se está realizando.\n" +msgstr "La reversión de «%s» se está realizando.\n" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1771,21 +1741,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1797,88 +1767,83 @@ #: src/sbackup/util/__init__.py:439 #, python-format msgid "%(mb)d MiB %(kb)d KiB" -msgstr "" +msgstr "%(mb)d MiB %(kb)d KiB" #: src/sbackup/util/__init__.py:442 #, python-format msgid "%(mb)d MiB %(kb)d KiB %(bytes)d" -msgstr "" +msgstr "%(mb)d MiB %(kb)d KiB %(bytes)d" #: src/sbackup/util/__init__.py:447 #, python-format msgid "%(mb)d MB %(kb)d kB" -msgstr "" +msgstr "%(mb)d MB %(kb)d kB" #: src/sbackup/util/__init__.py:450 #, python-format msgid "%(mb)d MB %(kb)d kB %(bytes)d" -msgstr "" +msgstr "%(mb)d MB %(kb)d kB %(bytes)d" #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." -msgstr "" +msgstr "No se definieron directorios para realizar copias de seguridad." #: src/sbackup/util/lock.py:76 msgid "Another application instance is already running." @@ -1891,11 +1856,11 @@ #: src/sbackup/util/lock.py:128 src/sbackup/util/lock.py:142 #, python-format msgid "Unable to remove lock file: %s" -msgstr "" +msgstr "No se puede eliminar el archivo de bloqueo: %s" #: src/sbackup/util/lock.py:132 src/sbackup/util/lock.py:144 msgid "Unable to remove lock file: File not found." -msgstr "" +msgstr "No se puede eliminar el archivo de bloqueo: No existe el archivo." #: data/ui/sbackup-config.glade:11 msgid "Exclude file type" @@ -1954,7 +1919,7 @@ #: data/ui/sbackup-config.glade:572 msgid "Configuration Profile Manager" -msgstr "" +msgstr "Administrador de Configuración de Perfil" #: data/ui/sbackup-config.glade:594 msgid "" @@ -1977,11 +1942,11 @@ #: data/ui/sbackup-config.glade:810 msgid "Profile name" -msgstr "" +msgstr "Nombre del perfil" #: data/ui/sbackup-config.glade:836 msgid "Enabled" -msgstr "" +msgstr "Activado" #: data/ui/sbackup-config.glade:915 data/ui/sbackup-restore.glade:7 msgid "Simple Backup Suite" @@ -1993,7 +1958,7 @@ #: data/ui/sbackup-config.glade:971 msgid "Save as..." -msgstr "" +msgstr "Guardar como..." #: data/ui/sbackup-config.glade:1008 msgid "_Tools" @@ -2005,11 +1970,11 @@ #: data/ui/sbackup-config.glade:1037 msgid "Profile Manager..." -msgstr "" +msgstr "Administrador de Perfiles..." #: data/ui/sbackup-config.glade:1058 msgid "Make backup now" -msgstr "" +msgstr "Hacer copia de seguridad ahora" #: data/ui/sbackup-config.glade:1079 msgid "_Help" @@ -2017,27 +1982,27 @@ #: data/ui/sbackup-config.glade:1087 msgid "_View all help topics" -msgstr "" +msgstr "_Ver todos los temas de ayuda" #: data/ui/sbackup-config.glade:1103 msgid "_About this program" -msgstr "" +msgstr "_Sobre este programa" #: data/ui/sbackup-config.glade:1154 msgid "Reload configuration" -msgstr "" +msgstr "Recargar configuración" #: data/ui/sbackup-config.glade:1168 msgid "Save configuration" -msgstr "" +msgstr "Guardar configuración" #: data/ui/sbackup-config.glade:1191 msgid "Make a backup now" -msgstr "" +msgstr "Hacer copia de seguridad ahora" #: data/ui/sbackup-config.glade:1214 msgid "Open the profile manager" -msgstr "" +msgstr "Abrir el administrador de perfiles" #: data/ui/sbackup-config.glade:1215 msgid "Profiles" @@ -2086,7 +2051,7 @@ #: data/ui/sbackup-config.glade:1380 data/ui/sbackup-config.glade:2323 msgid "MiB" -msgstr "" +msgstr "MiB" #: data/ui/sbackup-config.glade:1405 msgid "Split backup archives into several chunks" @@ -2096,7 +2061,7 @@ #: data/ui/sbackup-config.glade:2863 data/ui/sbackup-config.glade:3111 #: data/ui/sbackup-config.glade:3856 msgid "Help" -msgstr "" +msgstr "Ayuda" #: data/ui/sbackup-config.glade:1442 data/ui/sbackup-config.glade:2632 msgid "Show help topic about configuration GUI." @@ -2113,7 +2078,7 @@ #: data/ui/sbackup-config.glade:1570 data/ui/sbackup-config.glade:1818 #: data/ui/sbackup-config.glade:2023 data/ui/sbackup-config.glade:2181 msgid "Remove" -msgstr "" +msgstr "Eliminar" #: data/ui/sbackup-config.glade:1620 data/ui/sbackup-config.glade:1868 msgid "Add File" @@ -2137,7 +2102,7 @@ #: data/ui/sbackup-config.glade:2074 data/ui/sbackup-config.glade:2232 msgid "Add" -msgstr "" +msgstr "Agregar" #: data/ui/sbackup-config.glade:2109 msgid "File types" @@ -2155,7 +2120,7 @@ #: data/ui/sbackup-config.glade:2344 msgid "Follow symbolic links" -msgstr "" +msgstr "Seguir los enlaces simbólicos" #: data/ui/sbackup-config.glade:2373 msgid "Others" @@ -2167,11 +2132,11 @@ #: data/ui/sbackup-config.glade:2421 msgid "Use default backup directory" -msgstr "" +msgstr "Usar directorio de copias de seguridad predeterminado" #: data/ui/sbackup-config.glade:2446 msgid "/var/backup" -msgstr "" +msgstr "/var/backup" #: data/ui/sbackup-config.glade:2472 msgid "Use custom local backup directory" @@ -2183,7 +2148,7 @@ #: data/ui/sbackup-config.glade:2526 msgid "Use a remote site" -msgstr "" +msgstr "Usar un sitio remoto" #: data/ui/sbackup-config.glade:2568 msgid "ssh://username:password@example.com/remote/dir/" @@ -2191,7 +2156,7 @@ #: data/ui/sbackup-config.glade:2580 msgid "Connect..." -msgstr "" +msgstr "Conectar..." #: data/ui/sbackup-config.glade:2672 msgid "" @@ -2209,7 +2174,7 @@ #: data/ui/sbackup-config.glade:2742 msgid "_Simple" -msgstr "" +msgstr "_Simple" #: data/ui/sbackup-config.glade:2747 msgid "" @@ -2219,11 +2184,11 @@ #: data/ui/sbackup-config.glade:2761 msgid "_Custom" -msgstr "" +msgstr "_Personalizado" #: data/ui/sbackup-config.glade:2781 msgid "Do backups" -msgstr "" +msgstr "Hacer copias de seguridad" #: data/ui/sbackup-config.glade:2798 msgid "Cron time definition" @@ -2250,7 +2215,7 @@ #: data/ui/sbackup-config.glade:2937 msgid "Schedule" -msgstr "" +msgstr "Programar" #: data/ui/sbackup-config.glade:2955 msgid "Enable purging of old backups" @@ -2298,7 +2263,7 @@ #: data/ui/sbackup-config.glade:3209 msgid "Logging" -msgstr "" +msgstr "Acceso" #: data/ui/sbackup-config.glade:3234 msgid "Debug is just for debbuging purpose.Info is the recommended setting" @@ -2308,7 +2273,7 @@ #: data/ui/sbackup-config.glade:3236 msgid "Log level" -msgstr "" +msgstr "Nivel de registro" #: data/ui/sbackup-config.glade:3248 msgid "Debug is just for debbuging purpose. Info is the recommended setting." @@ -2320,23 +2285,23 @@ #: data/ui/sbackup-config.glade:3320 msgid "Report by mail" -msgstr "" +msgstr "Reporte por correo" #: data/ui/sbackup-config.glade:3350 msgid "From" -msgstr "" +msgstr "Desde" #: data/ui/sbackup-config.glade:3361 msgid "SMTP server" -msgstr "" +msgstr "Servidor SMTP" #: data/ui/sbackup-config.glade:3375 data/ui/sbackup-config.glade:4053 msgid "Port" -msgstr "" +msgstr "Puerto" #: data/ui/sbackup-config.glade:3391 msgid "To" -msgstr "" +msgstr "Para" #: data/ui/sbackup-config.glade:3478 msgid "Use a username and password" @@ -2352,11 +2317,11 @@ #: data/ui/sbackup-config.glade:3584 msgid "Use secure connection" -msgstr "" +msgstr "Usar conexión segura" #: data/ui/sbackup-config.glade:3615 msgid "Choose a certificate file" -msgstr "" +msgstr "Eija un Archivo de Certificado" #: data/ui/sbackup-config.glade:3629 msgid "Key" @@ -2368,11 +2333,11 @@ #: data/ui/sbackup-config.glade:3659 msgid "Choose a key file" -msgstr "" +msgstr "Elegir un archivo de clave" #: data/ui/sbackup-config.glade:3731 msgid "Test _mail settings" -msgstr "" +msgstr "Probar configuración de _correo" #: data/ui/sbackup-config.glade:3772 msgid "Report" @@ -2380,15 +2345,15 @@ #: data/ui/sbackup-config.glade:3811 msgid "Warning" -msgstr "" +msgstr "Advertencia" #: data/ui/sbackup-config.glade:3860 msgid "Show help topic about default values." -msgstr "" +msgstr "Mostrar tema de ayuda sobre los valores predeterminados." #: data/ui/sbackup-config.glade:3893 msgid "_Set" -msgstr "" +msgstr "_Configurar" #: data/ui/sbackup-config.glade:3935 msgid "Set remote target" @@ -2396,35 +2361,84 @@ #: data/ui/sbackup-config.glade:3957 msgid "Type of service" -msgstr "" +msgstr "Tipo de servicio" #: data/ui/sbackup-config.glade:3997 msgid "Hostname" -msgstr "" +msgstr "Nombre de Host" #: data/ui/sbackup-config.glade:4027 msgid "Details" -msgstr "" +msgstr "Detalles" #: data/ui/sbackup-config.glade:4157 msgid "Show password" -msgstr "" +msgstr "Mostrar contraseña" #: data/ui/sbackup-config.glade:4217 msgid "_Connect" -msgstr "" +msgstr "_Conectar" #: data/ui/sbackup-config.glade:4293 msgid "Make a full backup" +msgstr "Hacer una copia de seguridad completa" + +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Restaurar archivos/directorios" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Carpeta de origen de la restauración" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Copias de seguridad disponibles:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Usar personalizado:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Usar predeterminado:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Archivos y carpetas a restaurar" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Restaurar" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Restaurar como..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" msgstr "" #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" -msgstr "" +msgstr "Destino de la copia de seguridad" #: data/ui/sbackup-restore.glade:52 msgid "Displays the manual in Help browser." -msgstr "" +msgstr "Mostrar el manual en el visor de ayuda." #: data/ui/sbackup-restore.glade:85 msgid "Default profile's destination" @@ -2438,17 +2452,21 @@ #: data/ui/sbackup-restore.glade:137 msgid "Custom destination" -msgstr "" +msgstr "Destino personalizado" #: data/ui/sbackup-restore.glade:143 msgid "" "Select a backup destination on your harddisk or at a remote site. Press " "Apply when ready." msgstr "" +"Seleccionar el destino de la copia de seguridad en su disco duro o en un " +"sitio remoto. Presione aplicar cuando esta listo." #: data/ui/sbackup-restore.glade:184 msgid "Choose a destination folder. For remote sites fill URI in text field" msgstr "" +"Escoja un directorio de destino. Para sitios remotos colocar el URI en el " +"campo de texto" #: data/ui/sbackup-restore.glade:201 msgid "Change destination to path specified in left text field" @@ -2460,282 +2478,162 @@ #: data/ui/sbackup-restore.glade:310 msgid "Available backups" -msgstr "" +msgstr "Copias de seguridad disponibles" #: data/ui/sbackup-restore.glade:398 msgid "Delete snapshot" -msgstr "" +msgstr "Eliminar instantánea" #: data/ui/sbackup-restore.glade:436 msgid "Delete" msgstr "Eliminar" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "Actualizar" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "Historial de instantáneas" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" -msgstr "" +msgstr "Bae actual:" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "Gestión de instantáneas" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" -msgstr "" +msgstr "Detalles de la instantánea" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Restaurar" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "Revertir" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "Gestión de restauraciones" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "Gestión de exportaciones" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "Título" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "Contenido" -#~ msgid "Invalid value of the target directory : " -#~ msgstr "Valor no válido de directorio objetivo: " - -#~ msgid "Test Succeeded !" -#~ msgstr "¡Test satisfactorio!" - -#~ msgid "Target directory is writable." -#~ msgstr "El directorio de destino se puede escribir." - -#~ msgid "" -#~ "Please change target directory and test writability of the target directory " -#~ "by pressing \"Test\" button on the right." -#~ msgstr "" -#~ "Por favor, cambie el directorio de destino y compruebe si se permite la " -#~ "escritura en él presionando el botón \"Test\" de la derecha." - -#~ msgid "I didn't find the log file. Please set it up in sbackup.conf " -#~ msgstr "" -#~ "No encontré el archivo de registro. Por favor especifíquelo en sbackup.conf " - -#~ msgid "Set the reciever of this mail" -#~ msgstr "Establecer receptor de este correo" - -#~ msgid "Choose the SSL option (smtptls=1) to be able to use Cert and Key" -#~ msgstr "" -#~ "Seleccione la opción de SSL (smtptls=1) para poder usar certificado y clave" - -#~ msgid "Save to file ..." -#~ msgstr "Guardar al archivo..." - -#~ msgid "No directory to backup !" -#~ msgstr "¡ Falta directorio para copia de seguridad !" - -#~ msgid "Failed to set the gid to 'admin' one :" -#~ msgstr "No se pudo establecer gid como usuario" +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "Actualizando de v1.0 a v1.2: %s" -#~ msgid "Target not writeable: " -#~ msgstr "No se pued escribir en el destino " +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "Actualizando a v1.3: %s" -#~ msgid "" -#~ "Got a non valid snapshot '%(name)s' due to name convention : %(error_cause)s " -#~ msgstr "" -#~ "'%(name)s' no es una instantánea válida debido a la convención en los " -#~ "nombres: %(error_cause)s " +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "Actualizando a v1.4: %s" -#~ msgid "Cannot downgrade other format than 'gzip' to 1.4" -#~ msgstr "No se puede degradar a otro formato distinto de 'gzip' a 1.4" +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "Actualizando a v1.5: %s" -#~ msgid "'%d' test(s) didn't succeed !" -#~ msgstr "¡'%d' test(s) no tuvo/tuvieron éxito!" +#~ msgid "Unable to upgrade snapshot" +#~ msgstr "No se pudo actualizar la instantánea" -#~ msgid "Actual base : %s" -#~ msgstr "Base actual : %s" +#~ msgid "Upgrade" +#~ msgstr "Actualizar" -#~ msgid "" -#~ "Choose the compression format that you want to apply.\n" -#~ "Default is gzip." -#~ msgstr "" -#~ "Elija el formato de compresión a aplicar.\n" -#~ "Por defecto, se usa gzip." +#, python-format +#~ msgid "Rebasing '%(current)s' on '%(base)s'" +#~ msgstr "Rebasando '%(current)s' en '%(base)s" #~ msgid "" -#~ "Select the directory in which you have your backups.\n" -#~ "You can use a local or distant directory depending on the " -#~ "plugins you have installed." +#~ "There are snapshots stored in outdated snapshot formats. Please upgrade them " +#~ "using 'Simple Backup-Restoration' if you want to use them." #~ msgstr "" -#~ "Seleccione un directorio en el que desee tener sus copias de seguridad.\n" -#~ "Puede usar un directorio local o remoto dependiendo de los " -#~ "complementos instalados." - -#~ msgid "Use the default directory : " -#~ msgstr "Usar directorio por defecto: " - -#~ msgid "Use a custom directory : " -#~ msgstr "Usar directorio personalizado: " - -#~ msgid "Snapshots directory" -#~ msgstr "Directorio de instantáneas" - -#~ msgid "Restore As" -#~ msgstr "Restaurar como" - -#~ msgid "Revert As" -#~ msgstr "Revertir como" - -#~ msgid "Choose to upgrade your snapshot if needed." -#~ msgstr "Elija actualizar su instantánea si lo necesita." +#~ "Hay fotografias almacenadas en formatos de fotografia en desuso.Por favor " +#~ "mejora la calidad usando el restaurador de copia de seguridad simple (Simple " +#~ "Backup-Restoration) Si los desea usar" -#~ msgid "Actual base :" -#~ msgstr "Base actual :" +#~ msgid "Upgrade finished" +#~ msgstr "Actualización terminada" -#~ msgid "Select a snapshot and change its base to another snapshot." -#~ msgstr "Seleccione una instantánea y cambie su base a otra instantánea." +#, python-format +#~ msgid "Unable to remove upgrade stamp: %s" +#~ msgstr "No se pudo eliminar la marca de actualización: '%s'" -#~ msgid "This is a user friendly backup solution for common desktop needs." -#~ msgstr "" -#~ "Esta es una solución amigable de copia de seguridad para el usuario medio." +#~ msgid "Simple Backup upgrade" +#~ msgstr "Actualización Simple Backup" -#~ msgid "Starting snapshot %(name)s " -#~ msgstr "Comenzando creación de instantánea %(name)s " +#~ msgid "Snapshot was sucessfully upgraded." +#~ msgstr "La instantánea se actualizo con éxito." -#~ msgid "Target '%s' directory is excluded" -#~ msgstr "El directorio objetivo '%s' se excluye" +#, python-format +#~ msgid "File '%(file)s' does not exist." +#~ msgstr "El archivo '%(file)s' no existe." -#~ msgid "Problem with '%(file)s' : %(error)s " -#~ msgstr "Problema con '%(file)s': %(error)s " +#~ msgid "Upgrade snapshot" +#~ msgstr "Actualizar instantánea" -#~ msgid "'%(file)s' doesn't exist, it has to be exclude " -#~ msgstr "El archivo '%(file)s' no existe, se tiene que excluir " +#, python-format +#~ msgid "No need to rebase a full snapshot '%s'" +#~ msgstr "No hay necesidad de rehacer una instantánea completa «%s»" +#, python-format #~ msgid "" -#~ "We don't have read access to '%(file)s', it has to be exclude : %(error)s " +#~ "'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " #~ msgstr "" -#~ "No se tiene permisos de lectura a '%(file)s', se excluyen: %(error)s " - -#~ msgid "Terminating FUSE FILE ACCESS MANAGER !" -#~ msgstr "¡Terminando el GESTOR DE ACCESO A ARCHIVOS FUSE!" - -#~ msgid "Unable to change permissions for " -#~ msgstr "No se ha podido cambiar los permisos a " +#~ "'%(snapshotToRebase)s' no tiene un archivo «base», puede estar roto " +#, python-format #~ msgid "" -#~ "When setting a username (resp password), password (resp username) is " -#~ "mandatory" +#~ "Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " +#~ "'%(NewBaseSnapshot)s' " #~ msgstr "" -#~ "Al asignar un nombre de usuario (resp. contraseña), se requiere una " -#~ "contraseña (resp. nombre de usuario)" - -#~ msgid "Initializing FUSE FILE ACCESS MANAGER !" -#~ msgstr "¡Inicializando GESTOR DE ACCESO A ARCHIVOS FUSE!" - -#~ msgid "sbackup configuration error" -#~ msgstr "Error en la configuración de sbackup" +#~ "No se puede rehacer una instantánea en una más nuevo : " +#~ "'%(snapshotToRebase)s' <= '%(NewBaseSnapshot)s' " -#~ msgid "Couldn't make a proper backup : " -#~ msgstr "No se pudo hacer una copia correcta: " - -#~ msgid "Non existing directory : %s" -#~ msgstr "Directorio no existente: %s" +#, python-format +#~ msgid "An error occurred when pulling snapshot '%s'." +#~ msgstr "Ocurrió un error al tomar la instantánea «%s»." -#~ msgid "" -#~ "Please enter the new profile name in the Profile name entry and check " -#~ "the Enable checkbox to enable it." +#, python-format +#~ msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." #~ msgstr "" -#~ "Por favor, introduzca el nuevo nombre de perfil en la entrada de Nombre " -#~ "de perfil y compruebe que está activada la opción de Activar para " -#~ "habilitarlo." - -#~ msgid "gtk-no" -#~ msgstr "gtk-no" - -#~ msgid "gtk-yes" -#~ msgstr "gtk-yes" - -#~ msgid "gtk-remove" -#~ msgstr "gtk-remove" - -#~ msgid "gtk-add" -#~ msgstr "gtk-add" - -#~ msgid "gtk-close" -#~ msgstr "gtk-close" - -#~ msgid "gtk-edit" -#~ msgstr "gtk-edit" +#~ "El archivo SNAR ya existía en la instantánea «%s». No se ha sobreescrito." -#~ msgid "gtk-ok" -#~ msgstr "gtk-ok" +#~ msgid "The version of the snapshot is greater than the supported one!" +#~ msgstr "¡La versión de la instantánea es mayor que la permitida!" -#~ msgid "gtk-cancel" -#~ msgstr "gtk-cancel" - -#~ msgid "Time (for admins only)" -#~ msgstr "Tiempo (sólo para administradores)" - -#~ msgid "Test all" -#~ msgstr "Comprobar todo" - -#~ msgid "Log settings" -#~ msgstr "Configuración del registro" - -#~ msgid "Security" -#~ msgstr "Seguridad" - -#~ msgid "Parameters" -#~ msgstr "Parámetros" - -#~ msgid "" -#~ "'%(file)s' size is higher than the specified one ( %(filesize)s > " -#~ "%(maxsize)s), it has to be exclude " -#~ msgstr "" -#~ "El Tamaño de '%(file)s' es mayor que el especificado ( %(filesize)s > " -#~ "%(maxsize)s), ha de ser excluido. " +#, python-format +#~ msgid "Upgrade snapshot '%s'" +#~ msgstr "Actualizar instantánea «%s»" -#~ msgid "Deleting '%(snp)s' for purge !" -#~ msgstr "Borrando '%(snp)s' para purgar !" +#, python-format +#~ msgid "Base of snapshot '%s' is not set." +#~ msgstr "La base de la instantánea «%s» no se ha configurado." -#~ msgid "" -#~ "Debug is just for debbuging purpose\n" -#~ "Info is the recommended setting" -#~ msgstr "" -#~ "Debug es para propositos de debbuging\n" -#~ "Info es la configuracion recomendada" +#, python-format +#~ msgid "Cancelling pull of snapshot '%s'" +#~ msgstr "Cancelar la instantanea a la fuerza '%s'" diff -Nru sbackup-0.11.4/po/fa.po sbackup-0.11.6/po/fa.po --- sbackup-0.11.4/po/fa.po 2011-02-13 18:22:18.000000000 +0100 +++ sbackup-0.11.6/po/fa.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:18+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Persian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,55 +42,57 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" Artin https://launchpad.net/~artin" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -102,131 +104,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -336,65 +338,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "سفارشی" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "" @@ -410,328 +412,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Cancelling pull of snapshot '%s'" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -743,18 +676,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -766,65 +699,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -914,8 +851,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1210,126 +1146,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1338,77 +1268,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1437,7 +1367,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1445,12 +1375,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1526,11 +1456,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1556,58 +1486,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1616,22 +1494,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1640,35 +1518,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1676,21 +1554,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1699,21 +1577,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1721,21 +1599,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1766,67 +1644,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2357,6 +2230,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2409,68 +2331,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/fi.po sbackup-0.11.6/po/fi.po --- sbackup-0.11.4/po/fi.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/fi.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: nssbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:58+0000\n" -"Last-Translator: Otto Kekäläinen \n" +"Last-Translator: Otto Kekäläinen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:46+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,57 +42,58 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" -" Otto Kekäläinen https://launchpad.net/~otto" +" Otto Kekäläinen https://launchpad.net/~otto\n" +" raspi https://launchpad.net/~raspi" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -104,131 +105,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -338,65 +339,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Mukautettu" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3-musiikki" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI-video" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG-video" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matroska-video" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "OGG-multimedisäilö" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "CD-levykuvat" @@ -412,328 +413,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.3: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -745,18 +677,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -768,65 +700,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -916,8 +852,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1214,126 +1149,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1342,77 +1271,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1441,7 +1370,7 @@ msgid "Restore..." msgstr "Palauta..." -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1449,12 +1378,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1530,11 +1459,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1560,58 +1489,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1620,22 +1497,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1644,35 +1521,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1680,21 +1557,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1703,21 +1580,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1725,21 +1602,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1770,67 +1647,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2367,6 +2239,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Palauta tiedostot/hakemistot" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Palauta lähdekansio" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Saatavilla olevat varmuuskopiot:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Käytä omaa:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Käytä vakiota:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Palautettavat tiedostot ja kansiot" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Palauta" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Palauta nimellä..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2419,71 +2340,56 @@ msgid "Delete" msgstr "Poista" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Palauta" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "Otsikko" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" - -#~ msgid "disable" -#~ msgstr "poista käytöstä" diff -Nru sbackup-0.11.4/po/fo.po sbackup-0.11.6/po/fo.po --- sbackup-0.11.4/po/fo.po 2011-02-13 18:22:18.000000000 +0100 +++ sbackup-0.11.6/po/fo.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,18 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-11-30 23:49+0000\n" -"Last-Translator: Launchpad Translations Administrators " -"\n" +"Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Faroese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:46+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -28,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -43,53 +42,53 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" @@ -103,131 +102,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -337,65 +336,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "" @@ -411,328 +410,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Cancelling pull of snapshot '%s'" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -744,18 +674,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -767,65 +697,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -915,8 +849,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1211,126 +1144,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1339,77 +1266,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1438,7 +1365,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1446,12 +1373,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1527,11 +1454,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1557,58 +1484,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1617,22 +1492,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1641,35 +1516,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1677,21 +1552,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1700,21 +1575,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1722,21 +1597,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1767,67 +1642,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2358,6 +2228,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2410,68 +2329,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/fr.po sbackup-0.11.6/po/fr.po --- sbackup-0.11.4/po/fr.po 2011-02-13 18:22:17.000000000 +0100 +++ sbackup-0.11.6/po/fr.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" -"PO-Revision-Date: 2010-10-24 17:31+0000\n" -"Last-Translator: gilles chaon \n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" +"PO-Revision-Date: 2013-01-11 16:14+0000\n" +"Last-Translator: Olivier Maury \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-12 05:07+0000\n" +"X-Generator: Launchpad (build 16420)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "Démon Sbackup <%(login)s@%(hostname)s>" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "[Sbackup] [%(profile)s] Rapport du %(date)s" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "Aucun fichier journal indiqué." @@ -41,31 +41,31 @@ "\n" "Now continue processing remaining profiles." msgstr "" -"Erreur critique: aucun fichier de configuration trouvé pour le profile par " +"Erreur critique : aucun fichier de configuration trouvé pour le profil par " "défaut !\n" -"Continuer maintenant à traiter les profiles restants." +"Continuer maintenant à traiter les profils restants." -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "Sauvegarde annulée par l'utilisateur." -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "Une erreur est survenue durant l'annulation de la sauvegarde:" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "Une erreur est survenue durant la sauvegarde :" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "Erreur pendant l'envoi de courriel." -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "Les erreurs suivantes ont eu lieu avant:" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" @@ -74,7 +74,7 @@ "La sauvegarde n'a pas encore démarré.\n" "%s" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " @@ -84,25 +84,32 @@ "bureautique. Si vous souhaitez aider en soumettant des bugs, en traduisant " "ou quoique que se soit d'autre, merci de visiter notre site internet." -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "Mainteneurs :" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "Anciens contributeurs :" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "Contributeurs :" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" -" Antoine Pernot https://launchpad.net/~antoinepernot\n" +" Djiboun https://launchpad.net/~djiboun\n" " Eric Noel https://launchpad.net/~profnoel\n" " François Tissandier https://launchpad.net/~baloo\n" +" Gwendal Jabot https://launchpad.net/~gwendal-jabot\n" +" Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" +" LEROY Jean-Christophe https://launchpad.net/~celtic2-deactivatedaccount\n" +" NSV https://launchpad.net/~nsv\n" +" Olivier Maury https://launchpad.net/~olivier-maury\n" +" Olivier Tétard https://launchpad.net/~otetard\n" +" Pierre Slamich https://launchpad.net/~pierre-slamich\n" " gilles chaon https://launchpad.net/~g-chaon\n" " manu https://launchpad.net/~manu.pintor" @@ -116,61 +123,61 @@ msgid "Effective path for `%s` is not available" msgstr "Le chemin utilisé pour '%s' n'est pas disponible" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "Impossible d'obtenir le chemin utilisé pour '%s'" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" "Pour le moment la fonctionnalité scinder n'est pas compatible avec l'option " "compression." -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "Impossible de changer la permission du fichier '%s'." -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "Impossible d'effacer le fichier temporaire `%(file)s`: %(error)s" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "Lancement de TAR pour faire une sauvegarde incrémentielle." -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" "Impossible de trouver le fichier SNAR pour faire une sauvegarde " "incrémentielle." -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "Retour à une sauvegarde complète." -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "Lancement de TAR pour faire une sauvegarde complète." -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "La barre oblique '/' précédant le nom du membre a été supprimée." -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "La barre oblique '/' précédant le lien de la cible a été supprimée." -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "TAR a envoyé le message: %s" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" @@ -179,16 +186,16 @@ "TAR a envoyé le message:\n" "%s" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "TAR terminé avec succès." -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "TAR a envoyé l'avertissement: %s" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" @@ -197,58 +204,58 @@ "TAR a envoyé l'avertissement:\n" "%s" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "TAR a envoyé un avertissement, mais a complété avec succès." -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "Impossible d'achever avec succès. TAR a terminé avec des erreurs." -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "Impossible d'achever le processus en arrière-plan: %s" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "Inclus" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "Inchangé" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "Répertoire" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "La ligne doit être une chaîne de caractères" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "Inconsistance de 'Dumpdir' : 'nom fichier' est vide" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "Inconsistance de 'Dumpdir' : 'control' est vide" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "Le fichier '%s' n'existe pas." -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "L'entête du snarfile est incomplet." -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "Un fichier d'Instantané est requis" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "Le répertoire n'existe pas:%s." @@ -280,6 +287,11 @@ "\n" "Please check your configuration file." msgstr "" +"Erreur pendant le traitement de la configuration :\n" +"\n" +"%(error)s ligne(s) `%(line)s`.\n" +"\n" +"Veuillez vérifier votre fichier de configuration." #: src/sbackup/core/ConfigManager.py:588 src/sbackup/core/ConfigManager.py:622 #, python-format @@ -372,66 +384,68 @@ "When specifying a SSL certificate or key file, a key file resp. certificate " "is mandatory." msgstr "" +"Lors de la spécification d'un certificat SSL ou d'un fichier clé, un fichier " +"clé resp. certifié est obligatoire." -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Profil par défaut" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Profil inconnu" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "Illimité" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "100 Mo" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "250 Mo" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "650 Mo" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "2 Go (FAT16)" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "4 Go (FAT32)" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Personnalisé" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Musique MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "Vidéo AVI" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "Vidéo MPEG" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Vidéo Matroska" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "Conteneur multimédia OGG" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Images CD" @@ -449,234 +463,156 @@ "Le fichier '%(filename)s' est absent de la liste de fichiers de l'instantané " "[%(snapshotname)s], Ignorée." -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "L'instantané '%s' non trouvé. " -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" "L'instantané `%(name)s` est invalide raison: Le nom de l'instantané n'est " "pas valide." -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "L'instantané `%(name)s` est invalide raison: %(error_cause)s." -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" -"Il n'est pas nécessaire de changer la base d'une sauvegarde complète '%s'" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" -"%(snapshotToRebase)s' n'a pas le fichier 'base'. Il se pourrait qu'il soit " -"cassé. " - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" -"Nous ne pouvons pas changer la base d'une sauvegarde à une sauvegarde " -"postérieure : '%(snapshotToRebase)s' <= '%(NewBaseSnapshot)s' " - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "Changement de la base de '%(current)s' à '%(base)s'" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" -"Une erreur s'est produite lors de la récupération de l'instantané '%s'." - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "L'entête du fichier SNAR est incomplète !" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "La base de l'instantané '%s' n'est pas réglée," - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "L'instantané '%s' est déjà plein, abandon de l'opération." -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "Abandon de l'export du contenu de l'instantané '%s'" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "Impossible de supprimer la marque de la mise à jour: %s" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "Mise à jour de v1.0 à v1.2 : %s" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "Mise à jour à v1.3 : %s" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "Mise à jour à v1.4 : %s" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "Mise à jour à v1.5 : %s" - -#: src/sbackup/core/UpgradeManager.py:300 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." +msgid "Running of hooks: %s" msgstr "" -"Le fichier SNAR existe déjà pour l'instantané '%s'. Il ne sera pas écrasé." -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "Préparation du processus de sauvegarde" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" -"Il y a des instantanés utilisant un format obsolète. Pour les utiliser, " -"faire une mise à jour de ceux-ci en utilisant 'Simple Backup-Restoration'." - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "Instantané '%(name)s' en cours de création." -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "Réglage de la Base à '%(value)s'." -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "Réglage des fichiers de sauvegarde." -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "Il y a un problème lors du réglage de la liste des paquets. " -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "Réglage des exclusions de fichiers." -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "Réglage du format de compression à `%s`" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "Réglage de la taille des parties d'archive à %s" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "L'option 'suivre les liens symboliques' est activée." -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "L'option 'Suivre les liens symboliques' est désactivée." -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "Un instantané est en cours" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "Erreur pendant le nettoyage des anciens instantanés: %s" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "Le processus de sauvegarde est terminé." -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" "Inspection du système de fichiers et collecte des informations sur les " "fichiers" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "Résumé de la sauvegarde" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "Nombre de répertoires : %s." -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "Nombre total de fichiers : %s." -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "Nombre de liens symboliques : %s." -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "Nombre de fichiers inclus dans l'instantané : %s." -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "Nombre de nouveaux fichiers (également inclus) : %s." -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "Nombre de fichiers ignorés dans l'instantané incrémental : %s." -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "Nombre de fichiers exclus de force : %s." -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "Nombre de fichiers exclus selon la configuration : %s." -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "L'espace libre maximum requis est '%s'." -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "L'espace disque disponible est '%s'." -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " @@ -685,78 +621,78 @@ "Il n'y a pas assez d'espace disponible dans le répertoire cible pour la " "sauvegarde planifiée (libre:%(freespace)s, requis: %(neededspace)s)." -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" "Impossible de copier le journal. L'accès au fichier n'est pas initialisé." -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "Impossible de copier le fichier journal : %s" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" "Impossible de trouver le fichier de journal à copier dans l'instantané." -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "Aucun instantané pour copier le fichier de rapport." -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "Le traitement du profil a été annulé à la demande de l'utilisateur\n" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "Traitement du profil terminé avec succès (pas d'erreurs)\n" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "Le traitement du profil a échoué à cause de l'erreur : %s\n" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "Destination de la sauvegarde : %s" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "Impossible de trouver le répertoire de destination." -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" "Impossible de trouver le répertoire de destination après une nouvelle " "tentative." -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "Le répertoire de destination '%(target)s' n'existe pas." -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "Impossible d'accéder à la destination : %s" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "L'instantané est incohérent:__name n'est pas réglé " -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "Le nom de l'instantané '%s' ne correspond pas au schéma attendu." -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "L'instantané est incohérent:__snapshotpath n'est pas réglé " -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " @@ -765,33 +701,35 @@ "Le format de compression de l'instantané est censé être '%s' mais le fichier " "correctement nommé n'a pas été trouvé." -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" +"%(file)s ne contient pas de valeur valide. Les dossiers incomplets ou sans " +"rapport avec la sauvegarde seront ignorés. " -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "Le nom de l'instantané est invalide : %s" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "Nom du parent invalide : %s" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "Nom de l'instantané invalide : %s" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "Impossible de lire le fichier obligatoire 'ver'" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" "Le nom de la base doit être sélectionné pour une sauvegarde incrémentielle." @@ -804,18 +742,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "Clôture du gestionnaire d'accès aux fichiers FUSE." -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "SFTP" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "SSH" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "FTP" @@ -827,68 +765,72 @@ msgid "Terminating GIO File Access Manager." msgstr "Clôture du gestionnaire d'accès aux fichiers GIO." -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "NFS" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "SMB" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "Impossible d'obtenir le montage: le chemin n'est pas monté." -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" "Impossible d'obtenir le montage: aucun chemin trouvé pendant le montage (est " "probablement local)" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "Impossible de de monter: %s" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" "Impossible de désactiver le drapeau de montage: le chemin n'est pas conservé." -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "Le chemin est déjà monté." -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "Le chemin n'est pas monté." -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "Vérification du chemin spécifié utilisant GIO" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "Créer un répertoire de test" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "Vérification de l'existence de testfile" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "Créer un fichier" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "Relecture du fichier test" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "Supprimer le fichier" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "Supprimer le dossier" @@ -1004,8 +946,7 @@ "\n" "%s." -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "Erreur Simple Backup" @@ -1097,11 +1038,18 @@ "\n" "Important note: Saving will overwrite your existing invalid configuration." msgstr "" +"%s\n" +"\n" +"Un profil de sauvegarde utilisant les valeurs par défaut a été créé. " +"Enregistrez la nouvelle configuration afin de l'utiliser ou vérifiez " +"manuellement votre fichier de configuration existant.\n" +"\n" +"Important : Sauvegarder va écraser la configuration invalide existante." #: src/sbackup/ui/configgui.py:641 #, python-format msgid "Current profile: %s" -msgstr "Profile courant : %s" +msgstr "Profil actuel : %s" #: src/sbackup/ui/configgui.py:732 msgid "Already included item !" @@ -1254,7 +1202,7 @@ "The given name of the new profile is empty. Please enter a valid profile " "name." msgstr "" -"Le nom fourni pour le nouveau profile est vide. Merci d'entrer un nom de " +"Le nom fourni pour le nouveau profil est vide. Merci d'entrer un nom de " "profil valide." #: src/sbackup/ui/configgui.py:1911 src/sbackup/ui/configgui.py:1918 @@ -1269,7 +1217,7 @@ #: src/sbackup/ui/configgui.py:1919 msgid "Renaming of profiles is not supported." -msgstr "Le changement de nom des profils n'est pas possible." +msgstr "Le changement de nom des profils n'est pas pris en charge." #: src/sbackup/ui/configgui.py:1949 #, python-format @@ -1365,33 +1313,33 @@ msgid "there was a problem initializing the pynotify module" msgstr "Échec de l'initialisation du module de notification" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "La connexion au démon de notification a échoué : %s" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "Simple Backup" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "Montrer les fenêtres de notification" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "Annuler la Sauvegarde" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "Connection to D-Bus service lost." -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "La reconnexion a réussi" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." @@ -1399,32 +1347,24 @@ "Pas de sauvegarde en cours et la connexion au service D-Bus est perdu. " "L'indicateur Simple Backup est terminé." -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "Démarrage d'une session de sauvegarde" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "Fin de la session de sauvegarde" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" -"Il y a des instantanés comportant un ancien format. Veuillez les mettre à " -"niveau en utilisant l'utilitaire de Restauration si vous voulez les utiliser." - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "Réception de l'événement D-Bus '%s' reçu." -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "Réessayer" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." @@ -1432,67 +1372,67 @@ "Tentative de démarrage d'une autre instance de Simple Backup alors que celui-" "ci est déjà en cours d'exécution." -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "Impossible d'afficher la fenêtre:%s" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" "Êtes-vous certain de vouloir annuler le processus de sauvegarde du profil " "'%s'?" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "Annuler le processus de sauvegarde en cours d'exécution?" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "Impossible d'annuler le processus de sauvegarde." -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" -msgstr "Profil : %s" +msgstr "Profil : %s" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "Taille de la sauvegarde: %s" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "%.1f%% effectué" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "Temps restant : %s" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "Le PID du processus de sauvegarde est annulé: %s" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "impossible d'envoyer un signal au processus: %s" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "Envoie d'un signal en utilisant gksu au processus %s" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "L'envoie d'un signal en utilisant gksu au processus %s a échoué" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1505,80 +1445,80 @@ "Le répertoire cible indiqué '%s' n'existe pas.\n" "\n" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" "Vous pouvez essayer d'utiliser à nouveau la cible spécifiée ou annuler " -"l'exécution du profil. La destination spécifiée sera automatiquement utilisé " -"dans %s secondes." +"l'exécution du profil. La destination spécifiée sera automatiquement " +"utilisée dans %s secondes." -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "inconnu" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "Il y a moins d'une minute" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "Il y a 2 minutes" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "Il y a environ 3 minutes" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "Il y a environ 4 minutes" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "Il y a environ 5 minutes" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "Il y a environ %.0f minutes" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "En cours" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "Terminé" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "Progression : inconnue" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "La sauvegarde est en préparation" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "Collecte des informations sur les fichiers" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "Progression : annulée" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "Une erreur est survenue" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "Un autre 'Indicateur Simple Backup' est déjà en cours d'exécution." -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "L'initialisation de GTK+ a échoué : %s" @@ -1614,7 +1554,7 @@ msgid "Restore..." msgstr "Restoration ..." -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "Restoration en tant que ..." @@ -1622,12 +1562,12 @@ msgid "Revert..." msgstr "Rétrograder ..." -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "Rétrograder comme ..." #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "n.d." @@ -1703,15 +1643,12 @@ msgid "No backups found for this day." msgstr "Pas de sauvegarde trouvée pour ce jour." -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" -"La version de l'instantané n'est pas prise en charge (uniquement " -"%(supportedversion)s est supportée). La version actuel est " -"'%(currentversion)s'. Vous devriez le mettre à jour. " #: src/sbackup/ui/restoregui.py:643 msgid "Select restore location" @@ -1736,67 +1673,6 @@ msgstr "Lecture de l'instantané..." #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "La version de l'instantané est supérieure à celle supportée." - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" -"La mise à niveau de l'instantané sélectionné '%s' peut corrompre votre " -"sauvegarde pour ce point précis dans le temps. Cette opération est " -"irréversible. Il est recommandé de créer une copie du répertoire de " -"l'instantané avant la mise à niveau. Le processus de mise à niveau prend un " -"certain temps - soyez patient.\n" -"\n" -"Êtes-vous certain que vous souhaitez mettre à niveau l'instantané maintenant?" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "Voulez-vous vraiment mettre à jour l'instantané?" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "Mise à jour de l'instantané '%s'" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "L'instantané a été mise à jour avec succès." - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "Mise à niveau de Simple Backup" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "La mise à niveau est terminée" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" -"Lors de la mise à jour de l'instantané, l'erreur suivante est arrivée :\n" -"%s" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "Échec de la mise à jour de l'instantané." - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "Voulez vous vraiment changer la base de '%(current)s' à '%(base)s' ?" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1809,11 +1685,11 @@ "\n" "Êtes-vous certain que vous souhaitez supprimer l'instantané?" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "Voulez-vous vraiment supprimer l'instantané ?" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" @@ -1822,11 +1698,11 @@ "Lors de la suppression de l'instantané, l'erreur suivante est arrivée :\n" "%s" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "Impossible d'effacer l'instantané" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1834,36 +1710,40 @@ "\n" "Remove all of these child snapshots in order to delete this snapshot." msgstr "" +"L'instantané sélectionné '%s' est référencé par des instantanés plus récents " +"comme instantané de base.\n" +"\n" +"Effacer tous ces instantanés dépendants pour supprimer cet instantané." -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "Impossible de supprimer l'instantané" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "Annulation en cours" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "Restauration de Simple Backup" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "Restauration des fichiers sélectionnés" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "Restauration de '%s' en cours" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "Restauration de '%s' réussi" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1874,7 +1754,7 @@ "\n" "L'erreur suivante s'est produite:\n" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1883,7 +1763,7 @@ "Restauration de '%(source)s'\n" "dans '%(dirname)s' en cours." -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1892,7 +1772,7 @@ "Restauration de '%(source)s'\n" "dans '%(dirname)s' a réussi." -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1905,21 +1785,21 @@ "\n" "L'erreur suivante s'est produite:\n" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "Rétrograder les fichiers sélectionnés" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "Rétrogradation de '%s' en cours.\n" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "La rétrogradation de '%s' a réussi." -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1930,7 +1810,7 @@ "\n" "L'erreur suivante s'est produite:\n" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1939,7 +1819,7 @@ "Rétrogradation de '%(source)s' \n" "dans '%(dirname)s' en cours." -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1948,7 +1828,7 @@ "La rétrogradation de '%(source)s'\n" "vers'%(dirname)s' a réussi." -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1983,15 +1863,10 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "Le fichier '%(file)s' n'existe pas." - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "Le fichier '%(file)s' n'est pas accessible, erreur '%(error)s'" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." @@ -1999,60 +1874,60 @@ "Impossible d'ouvrir le fichier '%(file)s' en lecture. Délai dépassé pour " "l'opération." -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" "Le fichier '%(file)s' ne peut être ouvert en lecture, erreur '%(error)s'" -#: src/sbackup/util/filecollect.py:385 -#, python-format -msgid "File '%(file)s' is backup's target directory." -msgstr "" -"Le fichier '%(file)s' est le répertoire de destination de la sauvegarde." - -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:372 #, python-format msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" "Le lien symbolique '%(path)s' -> '%(ln_target)s' est un lien symbolique " "circulaire." -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "File '%(file)s' is backup's target directory." msgstr "" -"Le fichier '%(file)s' excède la taille maximale de fichier ( %(filesize)s > " -"%(maxsize)s)." +"Le fichier '%(file)s' est le répertoire de destination de la sauvegarde." + +#: src/sbackup/util/filecollect.py:393 +#, python-format +msgid "Path '%(file)s' defined in excludes list." +msgstr "Le chemin '%(file)s' est défini dans la liste des exclusions." -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" "Le fichier '%(file)s' correspond à l'expression régulière '%(regex)s'." -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." -msgstr "Le chemin '%(file)s' est défini dans la liste des exclusions." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgstr "" +"Le fichier '%(file)s' excède la taille maximale de fichier ( %(filesize)s > " +"%(maxsize)s)." -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "Erreur lors de la vérification du répertoire '%(dir)s' : %(error)s." -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "Une expression régulière vide a été trouvée et ignorée." -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "L'expression régulière ('%s') invalide a été ignorée." -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "Aucun répertoire de destination de la sauvegarde n'a été défini." @@ -2161,6 +2036,10 @@ "Please enter the new profile name and set the according checkbox in order to " "enable resp. disable it." msgstr "" +"Ajouter un nouveau profil\n" +"\n" +"Veuillez entrer le nom du nouveau profil et cocher la case afin de l'activer " +"ou de le désactiver." #: data/ui/sbackup-config.glade:810 msgid "Profile name" @@ -2280,7 +2159,7 @@ #: data/ui/sbackup-config.glade:1380 data/ui/sbackup-config.glade:2323 msgid "MiB" -msgstr "Mo" +msgstr "Mio" #: data/ui/sbackup-config.glade:1405 msgid "Split backup archives into several chunks" @@ -2633,6 +2512,55 @@ msgid "Make a full backup" msgstr "Faire une sauvegarde complète" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Restaurer les fichiers/répertoires" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Restaurer le répertoire d'origine" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Sauvegardes disponibles :" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Utiliser les réglages personnalisés :" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Utiliser les réglages par défaut :" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Fichiers et répertoires à restaurer" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Restaurer" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Restaurer en tant que..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "Destination de la sauvegarde<\\b>" @@ -2650,8 +2578,8 @@ "Set backup destination to the place specified in default configuration " "profile" msgstr "" -"Définir la destination de la sauvegarde à celle indiquée dans le profil de " -"configuration par défaut" +"Définir la destination de la sauvegarde comme celle indiquée dans le profil " +"de configuration par défaut" #: data/ui/sbackup-restore.glade:137 msgid "Custom destination" @@ -2694,47 +2622,35 @@ msgid "Delete" msgstr "Supprimer" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "Mise à jour de l'instantané" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "Mettre à jour" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "Historique des instantanés" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "Base active:" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "Sélectionner l'instantané dans la liste pour l'appliquer comme base." -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "Changer la base" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "Gestion de l'instantané" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "Détails de l'instantané" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "Restaurer les fichiers/répertoires de l'instantané sélectionné" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Restaurer" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" @@ -2742,294 +2658,168 @@ "Restaurer les fichiers / répertoires de manière récursive à partir de " "l'instantané de base vers l'instantané sélectionné" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "Rétrograder" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "Gestion de la restoration" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "Gestion de l'exportation" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "Titre" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "Contenu" -#~ msgid "(Not So) Simple Backup error" -#~ msgstr "Erreur (Not So) Simple Backup" - -#~ msgid "Import of module 'pynotify' failed with error: %s." -#~ msgstr "L'import du module 'pynotify' a échoué avec l'erreur : %s." - -#~ msgid "Failed to set the gid to 'admin' one :" -#~ msgstr "Echec du changement du groupe ID à 'admin'" - -#~ msgid "Setting split size." -#~ msgstr "Réglage de la taille de découpe." - -#~ msgid "Preparation of backup is done. Archive is being created." -#~ msgstr "" -#~ "La préparation de la sauvegarde est terminée. L'archive est en cours de " -#~ "création." - -#~ msgid "Target not writeable: " -#~ msgstr "Il n'est pas permis d'écrire dans le répertoire de destination. " - -#~ msgid "Invalid value of the target directory : " -#~ msgstr "Valeur du répertoire de destination des sauvegardes invalide " - -#~ msgid "" -#~ "Got a non valid snapshot '%(name)s' due to name convention : %(error_cause)s " -#~ msgstr "" -#~ "Sauvegarde '%(name)s' non valide à cause de la convention de nommage : " -#~ "%(error_cause)s " - -#~ msgid "Deleting snapshot: '%(snp)s'." -#~ msgstr "Suppression de l'instantané : '%(snp)s'." - -#~ msgid "Cannot downgrade other format than 'gzip' to 1.4" -#~ msgstr "Impossible de baiser le niveau d'un format autre que 'gzip' à 1.4" - -#~ msgid "" -#~ "A backup run is initiated in the background.\n" -#~ "The process id is: %s." -#~ msgstr "" -#~ "Une sauvegarde est en cours en tâche de fond.\n" -#~ "Le numéro de processus est : %s." - -#~ msgid "Test on '%s' didn't succeed!" -#~ msgstr "Le test sur '%s' a échoué !" - -#~ msgid "'%d' test(s) didn't succeed !" -#~ msgstr "'%d' tests n'ont pas reussi !" - -#~ msgid "Test Succeeded !" -#~ msgstr "Test réussi" - -#~ msgid "Target directory is writable." -#~ msgstr "Le répertoire cible n'est pas inscriptible." - -#~ msgid "" -#~ "Please change target directory and test writability of the target directory " -#~ "by pressing \"Test\" button on the right." +#, python-format +#~ msgid "No need to rebase a full snapshot '%s'" #~ msgstr "" -#~ "Veuillez changer le répertoire de destination et tester les permissions " -#~ "d'écriture en appuyant sur le bouton \"Test\" à droite." - -#~ msgid "disable" -#~ msgstr "désactiver" +#~ "Il n'est pas nécessaire de changer la base d'une sauvegarde complète '%s'" +#, python-format #~ msgid "" -#~ "You can't %s the Default Profile. Please use it if you need only one profile." +#~ "'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " #~ msgstr "" -#~ "Vous ne pouvez pas %s le Profil Par Défaut. Merci de l'utiliser si vous " -#~ "n'avez besoin que d'un profil." +#~ "%(snapshotToRebase)s' n'a pas le fichier 'base'. Il se pourrait qu'il soit " +#~ "cassé. " +#, python-format #~ msgid "" -#~ "The program is going to be terminated. Please make sure the missing " -#~ "directory exists (e.g. by mounting an external disk) or change the specified " -#~ "target in '(Not So) Simple Backup-Configuration' tool and restart this " -#~ "application." +#~ "Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " +#~ "'%(NewBaseSnapshot)s' " #~ msgstr "" -#~ "Le programme va se terminer. Merci de vérifier que le répertoire manquant " -#~ "existe (par exemple en montant un disque externe) ou en modifier la " -#~ "destination spécifiée dans l'outil '(Not So) Simple Backup-Configuration' et " -#~ "redémarrer l'application." - -#~ msgid "An error occurred during initialization:" -#~ msgstr "Une erreur s'est produite pendant l'initialisation :" +#~ "Nous ne pouvons pas changer la base d'une sauvegarde à une sauvegarde " +#~ "postérieure : '%(snapshotToRebase)s' <= '%(NewBaseSnapshot)s' " -#~ msgid "Actual base : %s" -#~ msgstr "Parent actuel : %s" - -#~ msgid "" -#~ "Choose the compression format that you want to apply.\n" -#~ "Default is gzip." -#~ msgstr "" -#~ "Choisissez le format de compression que vous voulez appliquer.\n" -#~ "Par défaut gzip" +#, python-format +#~ msgid "Rebasing '%(current)s' on '%(base)s'" +#~ msgstr "Changement de la base de '%(current)s' à '%(base)s'" -#~ msgid "" -#~ "Select the directory in which you have your backups.\n" -#~ "You can use a local or distant directory depending on the " -#~ "plugins you have installed." +#, python-format +#~ msgid "An error occurred when pulling snapshot '%s'." #~ msgstr "" -#~ "Sélectionner le répertoire dans lequel vous avez vos sauvegardes.\n" -#~ "Vous pouvez utiliser un répertoire local où distant selon les modules que " -#~ "vous avez installés." - -#~ msgid "Use the default directory : " -#~ msgstr "Utiliser le répertoire par défaut : " - -#~ msgid "Use a custom directory : " -#~ msgstr "Utiliser une répertoire personalisé : " - -#~ msgid "Snapshots directory" -#~ msgstr "Répertoire de sauvegarde" - -#~ msgid "Restore As" -#~ msgstr "Restaurer sous" +#~ "Une erreur s'est produite lors de la récupération de l'instantané '%s'." -#~ msgid "Revert As" -#~ msgstr "Revenir à" - -#~ msgid "Choose to upgrade your snapshot if needed." -#~ msgstr "Choisir de mettre à jour votre sauvegarde si besoin est." +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "Mise à jour de v1.0 à v1.2 : %s" -#~ msgid "Actual base :" -#~ msgstr "Base actuelle:" +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "Mise à jour à v1.3 : %s" -#~ msgid "Select a snapshot and change its base to another snapshot." -#~ msgstr "" -#~ "Sélectionner une sauvegarde et changer sa base à une autre sauvegarde." +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "Mise à jour à v1.4 : %s" -#~ msgid "Initializing FUSE FILE ACCESS MANAGER !" -#~ msgstr "Initialisation de FUSE FILE ACCESS MANAGER" +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "Mise à jour à v1.5 : %s" -#~ msgid "BackupManager created " -#~ msgstr "Création du BackupManager " +#, python-format +#~ msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" +#~ msgstr "Voulez vous vraiment changer la base de '%(current)s' à '%(base)s' ?" -#~ msgid "I didn't find the log file. Please set it up in sbackup.conf " -#~ msgstr "" -#~ "Je n'ai pas pu déterminer l'emplacement du fichier journal. Veuillez le " -#~ "configurer dans sbackup.conf " +#, python-format +#~ msgid "File '%(file)s' does not exist." +#~ msgstr "Le fichier '%(file)s' n'existe pas." -#~ msgid "Starting snapshot %(name)s " -#~ msgstr "Début de la sauvegarde %(name)s " +#~ msgid "Upgrade" +#~ msgstr "Mettre à jour" #~ msgid "" -#~ "We don't have read access to '%(file)s', it has to be exclude : %(error)s " +#~ "There are snapshots with old snapshot format. Please upgrade these using the " +#~ "Restoration tool if you want to use them." #~ msgstr "" -#~ "Nous n'avons pas accès en lecture à '%(file)s'. Il doit être exclu : " -#~ "%(error)s " - -#~ msgid "'%(file)s' doesn't exist, it has to be exclude " -#~ msgstr "'%(file)s' n'existe pas. Il doit être exclu " - -#~ msgid "Problem with '%(file)s' : %(error)s " -#~ msgstr "Un problem est survenu avec '%(file)s' : %(error)s " - -#~ msgid "got an error with '%(file)s' : %(error)s" -#~ msgstr "Une erreur est survenue avec '%(file)s' : %(error)s" +#~ "Il y a des instantanés comportant un ancien format. Veuillez les mettre à " +#~ "niveau en utilisant l'utilitaire de Restauration si vous voulez les utiliser." -#~ msgid "" -#~ "'%(file)s' size is higher than the specified one ( %(filesize)s > " -#~ "%(maxsize)s), it has to be exclude " -#~ msgstr "" -#~ "La taille de '%(file)s' est supérieure à celle définie ( %(filesize)s > " -#~ "%(maxsize)s), Il doit être exclu. " +#, python-format +#~ msgid "Base of snapshot '%s' is not set." +#~ msgstr "La base de l'instantané '%s' n'est pas réglée," -#~ msgid "Terminating FUSE FILE ACCESS MANAGER !" -#~ msgstr "Clôture de FUSE FILE ACCESS MANAGER !" +#, python-format +#~ msgid "Cancelling pull of snapshot '%s'" +#~ msgstr "Abandon de l'export du contenu de l'instantané '%s'" -#~ msgid "Set the reciever of this mail" -#~ msgstr "Destinataire du message" +#, python-format +#~ msgid "Unable to remove upgrade stamp: %s" +#~ msgstr "Impossible de supprimer la marque de la mise à jour: %s" -#~ msgid "Choose the SSL option (smtptls=1) to be able to use Cert and Key" +#, python-format +#~ msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." #~ msgstr "" -#~ "Choisissez l'option SSL (smtptls=1) pour être capable d'utiliser un " -#~ "Certificat et une Clé." +#~ "Le fichier SNAR existe déjà pour l'instantané '%s'. Il ne sera pas écrasé." #~ msgid "" -#~ "When setting a username (resp password), password (resp username) is " -#~ "mandatory" +#~ "There are snapshots stored in outdated snapshot formats. Please upgrade them " +#~ "using 'Simple Backup-Restoration' if you want to use them." #~ msgstr "" -#~ "Si vous spécifiez un nom d'utilisateur (resp. mot de passe), vous devez " -#~ "aussi spécifier un mot de passe (resp nom d'utilisateur)" +#~ "Il y a des instantanés utilisant un format obsolète. Pour les utiliser, " +#~ "faire une mise à jour de ceux-ci en utilisant 'Simple Backup-Restoration'." -#~ msgid "Save to file ..." -#~ msgstr "Enregistrer sous le fichier ..." +#~ msgid "Upgrade snapshot" +#~ msgstr "Mise à jour de l'instantané" -#~ msgid "Test all" -#~ msgstr "Tester Tout" +#~ msgid "Do you really want to upgrade snapshot?" +#~ msgstr "Voulez-vous vraiment mettre à jour l'instantané?" -#~ msgid "Log settings" -#~ msgstr "Paramétrages des logs" +#~ msgid "Snapshot was sucessfully upgraded." +#~ msgstr "L'instantané a été mise à jour avec succès." +#, python-format #~ msgid "" -#~ "Debug is just for debbuging purpose\n" -#~ "Info is the recommended setting" +#~ "Snapshot version is not supported (Only %(supportedversion)s is supported). " +#~ "Version '%(currentversion)s' found. You should upgrade it. " #~ msgstr "" -#~ "Debug est juste pour le déboguage\n" -#~ "Info est la valeur recommandée" - -#~ msgid "Parameters" -#~ msgstr "Paramètres" +#~ "La version de l'instantané n'est pas prise en charge (uniquement " +#~ "%(supportedversion)s est supportée). La version actuel est " +#~ "'%(currentversion)s'. Vous devriez le mettre à jour. " -#~ msgid "Security" -#~ msgstr "Sécurité" +#~ msgid "The version of the snapshot is greater than the supported one!" +#~ msgstr "La version de l'instantané est supérieure à celle supportée." -#~ msgid "Time (for admins only)" -#~ msgstr "Plannification (seulement pour les admins)" - -#~ msgid "Got an exception when Pulling '%s' : " -#~ msgstr "Erreur récupérée en transférant '%s' " - -#~ msgid "Snapshot '%s' is a full . Can't rebase on older snapshot" +#, python-format +#~ msgid "" +#~ "Upgrading the selected snapshot `%s` might corrupt your backup for this " +#~ "particular point in time. You cannot undo this operation. It is recommended " +#~ "to create a copy of the snapshot directory before upgrading it. The upgrade " +#~ "process takes a while - be patient.\n" +#~ "\n" +#~ "Are you sure that you want to upgrade the snapshot now?" #~ msgstr "" -#~ "La sauvegarde '%s' est une sauvegarde complète. Nous ne pouvons changer la " -#~ "base sur une plus ancienne sauvegarde." +#~ "La mise à niveau de l'instantané sélectionné '%s' peut corrompre votre " +#~ "sauvegarde pour ce point précis dans le temps. Cette opération est " +#~ "irréversible. Il est recommandé de créer une copie du répertoire de " +#~ "l'instantané avant la mise à niveau. Le processus de mise à niveau prend un " +#~ "certain temps - soyez patient.\n" +#~ "\n" +#~ "Êtes-vous certain que vous souhaitez mettre à niveau l'instantané maintenant?" -#~ msgid "Target '%s' directory is excluded" -#~ msgstr "Le répertoire de destination '%s' est exclue" - -#~ msgid "Deleting '%(snp)s' for purge !" -#~ msgstr "Suppression de '%(snp)s' pour la purge !" - -#~ msgid "Non existing directory : %s" -#~ msgstr "Dossier non existant : %s" - -#~ msgid "gtk-no" -#~ msgstr "Non" - -#~ msgid "gtk-yes" -#~ msgstr "Oui" - -#~ msgid "gtk-remove" -#~ msgstr "gtk-remove" - -#~ msgid "gtk-add" -#~ msgstr "gtk-add" - -#~ msgid "gtk-close" -#~ msgstr "gtk-close" - -#~ msgid "gtk-ok" -#~ msgstr "gtk-ok" - -#~ msgid "gtk-cancel" -#~ msgstr "gtk-cancel" - -#~ msgid "gtk-edit" -#~ msgstr "gtk-edit" +#, python-format +#~ msgid "Upgrade snapshot '%s'" +#~ msgstr "Mise à jour de l'instantané '%s'" -#~ msgid "Unable to change permissions for " -#~ msgstr "Impossible de changer les permissions pour " +#~ msgid "Simple Backup upgrade" +#~ msgstr "Mise à niveau de Simple Backup" -#~ msgid "sbackup configuration error" -#~ msgstr "Erreur de configuration de sbackup" +#~ msgid "Upgrade finished" +#~ msgstr "La mise à niveau est terminée" +#, python-format #~ msgid "" -#~ "Please enter the new profile name in the Profile name entry and check " -#~ "the Enable checkbox to enable it." -#~ msgstr "" -#~ "Entrez le nom du nouveau profile dans l'entrée Nom du profile et " -#~ "cochez la case Activé pour l'activer." - -#~ msgid "No directory to backup !" -#~ msgstr "Aucun répertoire à sauvegarder !" - -#~ msgid "This is a user friendly backup solution for common desktop needs." +#~ "While attempting to upgrade snapshot the following error occurred:\n" +#~ "%s" #~ msgstr "" -#~ "Ceci est une solution de sauvegarde conviviale adaptée aux besoins des " -#~ "ordinateurs de bureau." +#~ "Lors de la mise à jour de l'instantané, l'erreur suivante est arrivée :\n" +#~ "%s" -#~ msgid "File list ready, committing to disk." -#~ msgstr "La liste des fichiers est prête, écriture sur le disque." +#~ msgid "Unable to upgrade snapshot" +#~ msgstr "Échec de la mise à jour de l'instantané." diff -Nru sbackup-0.11.4/po/gl.po sbackup-0.11.6/po/gl.po --- sbackup-0.11.4/po/gl.po 2011-02-13 18:22:17.000000000 +0100 +++ sbackup-0.11.6/po/gl.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:52+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:46+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,59 +42,62 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Tradución feita pola comunidade en launchpad.net\n" "\n" "Launchpad Contributions:\n" -" Jean-Peer Lorenz https://launchpad.net/~peer.loz" +" Fran Diéguez https://launchpad.net/~frandieguez\n" +" Iago Ramos https://launchpad.net/~iago\n" +" Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" +" Miguel Anxo Bouzada https://launchpad.net/~mbouzada" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -106,131 +109,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -340,65 +343,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Personalizados" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Música MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "Video AVI" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "Video MPEG" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Video Matrjoshka" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "Contido multimedia OGG" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Imaxe de CD" @@ -416,328 +419,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.3: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -749,18 +683,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -772,65 +706,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -920,8 +858,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1217,126 +1154,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1345,77 +1276,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1444,7 +1375,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1452,12 +1383,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1533,11 +1464,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1563,58 +1494,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1623,22 +1502,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1647,35 +1526,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1683,21 +1562,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1706,21 +1585,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1728,21 +1607,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1773,67 +1652,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2370,6 +2244,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Restaurar ficheiros/cartafoles" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Restaurar cartafol de orixe" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Copias de seguranza dispoñíbeis:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Empregar personalizado:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Empregar predeterminado:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Ficheiros e cartafoles para restaurar" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Restaurar" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Restaurar como..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2422,68 +2345,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Restaurar" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/he.po sbackup-0.11.6/po/he.po --- sbackup-0.11.4/po/he.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/he.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-09-25 00:04+0000\n" "Last-Translator: itzik_b \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:46+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,53 +42,53 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -104,131 +104,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -338,65 +338,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "פרופיל ברירת מחדל" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "" @@ -412,328 +412,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Cancelling pull of snapshot '%s'" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -745,18 +676,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -768,65 +699,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -916,8 +851,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1212,126 +1146,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1340,77 +1268,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1439,7 +1367,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1447,12 +1375,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1528,11 +1456,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1558,58 +1486,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1618,22 +1494,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1642,35 +1518,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1678,21 +1554,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1701,21 +1577,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1723,21 +1599,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1768,67 +1644,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2359,6 +2230,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2411,71 +2331,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" - -#~ msgid "I didn't find the log file. Please set it up in sbackup.conf " -#~ msgstr "קובץ לוג לא נמצא, נא להגדירו בsbackup.conf " diff -Nru sbackup-0.11.4/po/hu.po sbackup-0.11.6/po/hu.po --- sbackup-0.11.4/po/hu.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/hu.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" -"PO-Revision-Date: 2010-10-05 13:57+0000\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" +"PO-Revision-Date: 2011-02-06 11:36+0000\n" "Last-Translator: Krasznecz Zoltán \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "SBackup Démon <%(login)s@%(hostname)s>" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "[SBackup] [%(profile)s] Jelentés: %(date)s" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "Nincs naplófájl megadva." @@ -44,27 +44,27 @@ "Kritikus hiba: Nincs konfigurációs fájl az alapértelmezett profilhoz!\n" "A hátralévő profilok folytatása következik." -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "A felhasználó megszakította a mentést." -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "Hiba történt a mentés megszakításakor." -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "Hiba történt a mentés során." -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "Hiba a levélküldéskor:" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "A következő hibák történtek eddig:" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" @@ -73,7 +73,7 @@ "A mentés nem indult el.\n" "%s" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " @@ -83,26 +83,29 @@ "Amennyiben segítenél hibakeresésben, fordításban vagy egyéb dologban, kérlek " "látogass el az oldalunkra." -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "Karbantartók:" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "Korábbi karbantartók:" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "Közreműködők:" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "A fordítók listája\n" "\n" "Launchpad Contributions:\n" " Hrotkó Gábor https://launchpad.net/~roti-al\n" -" Krasznecz Zoltán https://launchpad.net/~krasznecz-zoltan" +" Krasznecz Zoltán https://launchpad.net/~krasznecz-zoltan\n" +" Richard Somlói https://launchpad.net/~ricsipontaz\n" +" Szenográdi Norbert Péter https://launchpad.net/~sevoir\n" +" Vaci https://launchpad.net/~v-gaabor" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -114,57 +117,57 @@ msgid "Effective path for `%s` is not available" msgstr "A tényleges útvonal nem eléhető ehhez: `%s`" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "A tényleges útvonal nem található ehhez: `%s`" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "Nem módosítható a jogosultság ehhez: '%s'." -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "Átmeneti fájl nem törölhető `%(file)s`: %(error)s" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "TAR indítása az inkrementális mentéshez." -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "Nem található a SNAR fájl az inkrementális mentés készítéséhez." -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "Visszatérés a teljes mentéshez." -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "TAR indítása a teljes mentéshez." -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "A kezdő '/' jelek eltávolításra kerültek a nevekből." -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "A TAR a következő üzenetet adta vissza: %s" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" @@ -173,16 +176,16 @@ "A TAR a következő üzeneteket adta vissza:\n" "%s" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "A TAR sikeresen lefutott." -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "A TAR a következő figyelmeztetést adta vissza: %s" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" @@ -191,58 +194,58 @@ "A TAR a következő figyelmeztetéseket adta vissza:\n" "%s" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "A TAR figyelmeztetéseket adott vissza, de sikeresen lefutott." -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "Befejezés sikertelen. A TAR hibával megszakadt." -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "Nem sikerült a háttérfolyamat megállítása: %s" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "Csatolva" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "Nem változott" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "Könyvtár" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" -msgstr "" +msgstr "A sornak szövegnek kell lennie" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "A fájl nem létezik: '%s'" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "A SNAR fájl fejléce hiányos." -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "Pillanatkép fájl szükséges" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "A könyvtár nem létezik: %s." @@ -292,22 +295,24 @@ #: src/sbackup/core/ConfigManager.py:638 msgid "You must provide a dictionary." -msgstr "" +msgstr "Meg kell adnod egy könyvtárat." #: src/sbackup/core/ConfigManager.py:755 #, python-format msgid "Log output for [%(profile)s] is directed to file '%(file)s'." msgstr "" +"A [%(profile)s] naplókimenete átirányításra került a következő fájlba: " +"'%(file)s'." #: src/sbackup/core/ConfigManager.py:762 #, python-format msgid "Log output for [%s] is not directed into a file." -msgstr "" +msgstr "A [%s] naplókimenete nem került átirányításra fájlba." #: src/sbackup/core/ConfigManager.py:781 #, python-format msgid "Unable to rename log file '%(src)s'->'%(dst)s': %(err)s" -msgstr "" +msgstr "Nem sikerült a naplófájl átnevezése '%(src)s'->'%(dst)s': %(err)s" #: src/sbackup/core/ConfigManager.py:801 #, python-format @@ -317,7 +322,7 @@ #: src/sbackup/core/ConfigManager.py:813 #, python-format msgid "section [%(section)s] in '%(configfile)s' should not exist, aborting" -msgstr "" +msgstr "A [%(section)s] rész a '%(configfile)s' fájlban nem létezik, kilépek" #: src/sbackup/core/ConfigManager.py:895 msgid "No schedule defined in configuration file. Probing from filesystem." @@ -330,7 +335,7 @@ #: src/sbackup/core/ConfigManager.py:1163 msgid "No receiver set." -msgstr "" +msgstr "Nincs fogadó beállítva." #: src/sbackup/core/ConfigManager.py:1165 msgid "No SMTP server set." @@ -350,6 +355,9 @@ "set.\n" "Select SSL in order to use Certificate and Key." msgstr "" +"Tanúsítvány és kulcsfájl található, de az SSL opció (smtptls=1) nincs " +"beállítva.\n" +"Válassza az SSL-t a tanúsítvány és a kulcsfájl használatához." #: src/sbackup/core/ConfigManager.py:1178 msgid "" @@ -357,65 +365,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Alapértelmezett Profil" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Ismeretlen Profil" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" -msgstr "" +msgstr "Korlátlan" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "100 MiB" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "250 MiB" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "650 MiB" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "2 GiB (FAT16)" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "4 GiB (FAT32)" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Egyéni" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3 Zene" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI Video" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG Video" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matrjoshka Video" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "OGG Multimédia tároló" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "CD Képek" @@ -430,329 +438,265 @@ "File '%(filename)s' not found in snapshot's [%(snapshotname)s] files list, " "Skipped." msgstr "" +"A(z) '%(filename)s' fájl nem található a következő biztonsági mentés " +"fájllistájában: [%(snapshotname)s] , Átugrom." -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " -msgstr "" +msgstr "A következő biztonsági mentés nem található: '%s' " -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" +"Érvénytelen biztonsági mentés: `%(name)s`: Név vagy biztonsági mentés " +"érvénytelen." -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" +"Érvénytelen biztonsági mentés `%(name)s`-t találtam: %(error_cause)s." -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Unable to remove upgrade stamp: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "Frissítés v.1.0-ról v1.2-re: %s" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "Frissítés v1.3-ra: %s" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "Frissítés v1.4-re: %s" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "Frissítés v1.5-re: %s" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" -msgstr "" - -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" +msgstr "Biztonsági mentés folyamatának előkészítése" -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "Mappák száma: %s." -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "A '%(target)s' célmappa nem létezik." -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -764,18 +708,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -787,65 +731,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -935,8 +883,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1233,126 +1180,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1361,77 +1302,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1460,7 +1401,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1468,12 +1409,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1549,11 +1490,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1579,58 +1520,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1639,22 +1528,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1663,35 +1552,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "A kiválaszott fájlok visszaállítása" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "'%s' visszaállítása folyatban." -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1699,21 +1588,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1722,21 +1611,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1744,21 +1633,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1789,69 +1678,64 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "A '%(file)s' fájl nem létezik." - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -"A(z) '%(file)s' túllépte a maximális fájlméretet ( %(filesize)s > " -"%(maxsize)s)." -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" +"A(z) '%(file)s' túllépte a maximális fájlméretet ( %(filesize)s > " +"%(maxsize)s)." -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2387,6 +2271,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Fájlok/könyvtárak visszaállítása" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Forráskönyvtár visszaállítása" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Elérhető biztonsági-mentések:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Egyéni beállítás használata:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Alapbeállítás használata:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Fájlok és könyvtárak visszaállítása" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Helyreállítás" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Visszaállítás mint..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2439,86 +2372,86 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "Pillanatkép Kezelő" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Helyreállítás" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" -#~ msgid "Target not writeable: " -#~ msgstr "A cél nem írható: " +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "Frissítés v.1.0-ról v1.2-re: %s" + +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "Frissítés v1.3-ra: %s" -#~ msgid "Test Succeeded !" -#~ msgstr "Teszt Sikeres !" +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "Frissítés v1.4-re: %s" -#~ msgid "Target directory is writable." -#~ msgstr "A célkönyvtár írható." +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "Frissítés v1.5-re: %s" -#~ msgid "Use the default directory : " -#~ msgstr "Az alapértelmezett mappa használata : " +#, python-format +#~ msgid "File '%(file)s' does not exist." +#~ msgstr "A '%(file)s' fájl nem létezik." -#~ msgid "Use a custom directory : " -#~ msgstr "Egyéni mappa használata : " +#, python-format +#~ msgid "No need to rebase a full snapshot '%s'" +#~ msgstr "Nincs szükség a teljes mentés átállítására '%s'" -#~ msgid "Snapshots directory" -#~ msgstr "Pillanatképek könyvtár" +#, python-format +#~ msgid "" +#~ "'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " +#~ msgstr "" +#~ "Nem tartozik 'alap' fájl ehhez:'%(snapshotToRebase)s' , talán sérült " diff -Nru sbackup-0.11.4/po/id.po sbackup-0.11.6/po/id.po --- sbackup-0.11.4/po/id.po 2011-02-13 18:22:17.000000000 +0100 +++ sbackup-0.11.6/po/id.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-09-25 00:07+0000\n" "Last-Translator: tunggul arif siswoyo \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,53 +42,53 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -104,131 +104,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -338,65 +338,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "" @@ -412,328 +412,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Cancelling pull of snapshot '%s'" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -745,18 +676,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -768,65 +699,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -916,8 +851,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1214,126 +1148,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1342,77 +1270,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1441,7 +1369,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1449,12 +1377,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1530,11 +1458,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1560,58 +1488,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1620,22 +1496,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1644,35 +1520,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1680,21 +1556,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1703,21 +1579,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1725,21 +1601,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1770,67 +1646,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2361,6 +2232,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2413,68 +2333,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/is.po sbackup-0.11.6/po/is.po --- sbackup-0.11.4/po/is.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/is.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:34+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Icelandic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,55 +42,57 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" Pétur Ingi Egilsson https://launchpad.net/~petur" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -102,131 +104,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -336,65 +338,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Sérniðið" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3 Tónlist" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI Video" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG Video" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matrjoshka Video" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "OGG Margmiðlunar skrár" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "CD myndir" @@ -410,328 +412,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.3: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -743,18 +676,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -766,65 +699,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -914,8 +851,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1211,126 +1147,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1339,77 +1269,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1438,7 +1368,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1446,12 +1376,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1527,11 +1457,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1557,58 +1487,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1617,22 +1495,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1641,35 +1519,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1677,21 +1555,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1700,21 +1578,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1722,21 +1600,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1767,67 +1645,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2362,6 +2235,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Endurheimta skrár/möppur" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Endurheimta Upphafsmöppu" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Afritunartökur á skrá" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Nota sérsnið:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Nota sjálfgefið:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Skrár og Möppur sem hægt er að endurheimta" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Endurheimta" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Endurheimta Sem..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2414,68 +2336,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Endurheimta" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/it.po sbackup-0.11.6/po/it.po --- sbackup-0.11.4/po/it.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/it.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" -"PO-Revision-Date: 2010-10-05 13:38+0000\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" +"PO-Revision-Date: 2011-02-06 11:43+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "Demone SBackup <%(login)s@%(hostname)s>" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "[SBackup] [%(profile)s] Rapporto del %(date)s" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "Nessun file di registro specificato." @@ -46,69 +46,75 @@ "\n" "Continuare elaborando i profili rimanenti." -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." -msgstr "Backup annullato dall'utente" +msgstr "Backup annullato dall'utente." -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" -msgstr "Un errore si è verificato durante la cancellazione del backup:" +msgstr "Si è verificato un errore durante l'annullamento del backup:" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" -msgstr "Un errore si è verificato durante il backup:" +msgstr "Si è verificato un errore durante il backup:" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" -msgstr "Errore durante l'invio di email:" +msgstr "Errore durante l'invio dell'email:" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "Si sono verificati i seguenti errori:" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -"Il backup non e' stato avviato.\n" +"Il backup non è stato avviato.\n" "%s" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -"Questa è una soluzione semplice di backup per le esigenze dei comuni " -"desktop. Se vuoi contribuire sottoponendo bug, traducendo o qualsiasi altra " -"cosa per favore visita il nostro sito web." +"Questa è una soluzione di backup di facile utilizzo per le esigenze dei " +"comuni desktop. Per contribuire segnalando bug, traducendo o facendo " +"qualunque altra cosa visitare il sito web del progetto." -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" -msgstr "Mantenuto da:" +msgstr "Manutentori:" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "Precedenti manutentori:" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" -msgstr "Collaboratori:" +msgstr "Contributori:" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Ubuntu Italian Translators, https://launchpad.net/~ubuntu-l10n-it, 2006-" "2007\n" "\n" "Launchpad Contributions:\n" +" Alessio Treglia https://launchpad.net/~quadrispro\n" " Claudio Arseni https://launchpad.net/~claudio.arseni\n" " Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" " LoReNicolò https://launchpad.net/~god121-p-l\n" +" Luca Ferretti https://launchpad.net/~elle.uca\n" " Lucius https://launchpad.net/~lucius-ald\n" -" Riccardo Angelino https://launchpad.net/~rikyinformation\n" +" Michele Angrisano https://launchpad.net/~darksun88-deactivatedaccount\n" +" Milo Casagrande https://launchpad.net/~milo\n" +" Riccardo Angelino https://launchpad.net/~riccardoangelino\n" +" enubuntu https://launchpad.net/~enubuntu\n" +" frazar0 https://launchpad.net/~frazar0\n" " katane https://launchpad.net/~skorpio1066" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 @@ -119,62 +125,62 @@ #: src/sbackup/ar_backend/tar.py:123 #, python-format msgid "Effective path for `%s` is not available" -msgstr "" +msgstr "Il percorso effettivo per \"%s\" non è disponibile" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" -msgstr "" +msgstr "Impossibile ottenere il percorso effettivo per \"%s\"" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" "Al momento la funzione di divisione non è compatibile con l'opzione di " "compressione." -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." -msgstr "Impossibile cambiare i permessi per il file «%s»." +msgstr "Impossibile cambiare i permessi per il file \"%s\"." -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" -msgstr "Impossibile rimuovere il file temporaneo `%(file)s`: %(error)s" +msgstr "Impossibile rimuovere il file temporaneo \"%(file)s\": %(error)s" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." -msgstr "Avvio TAR per eseguire backup incrementale." +msgstr "Avvio di TAR per eseguire backup incrementale." -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" "Impossibile trovare il file SNAR per eseguire un backup incrementale." -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." -msgstr "Tornare indietro al backup completo." +msgstr "Ripiegare sul backup completo." -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." -msgstr "Avvio TAR per eseguire backup completo." +msgstr "Avvio di TAR per eseguire backup completo." -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." -msgstr "La prima '/' è stata rimossa dai nomi dei membri." +msgstr "La \"/\" principale è stata rimossa dai nomi dei membri." -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." -msgstr "La prima '/' è stata rimossa dai collegamenti hard link" +msgstr "La \"/\" principale è stata rimossa dai collegamenti hard link" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "TAR ha restituito un messaggio: %s" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" @@ -183,16 +189,16 @@ "TAR ha restituito dei messaggi:\n" "%s" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "TAR è stato completato con successo." -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "TAR ha restituito un avviso: %s" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" @@ -201,59 +207,59 @@ "TAR ha restituito avvisi:\n" "%s" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "TAR ha restituito degli avvisi ma e' stato completato con successo." -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" "Impossibile completare con successo. TAR è stato terminato con errori." -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "Impossibile terminare il processo in backend: %s" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "Incluso" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "Invariato" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "Directory" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "La riga deve essere una stringa" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "Directory di dump inconsistente: «filename» è vuoto" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "Directory di dump inconsistente: «control» è vuoto" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "Il file «%s» non esiste." -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "Intestazione del file snar incompleta." -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "È richiesto un file immagine" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "La directory non esiste: %s." @@ -285,6 +291,11 @@ "\n" "Please check your configuration file." msgstr "" +"Errore durante nell'elaborazione della configurazione:\n" +"\n" +"%(error)s alla linea `%(line)s`.\n" +"\n" +"Si prega di controllare il file di configurazione." #: src/sbackup/core/ConfigManager.py:588 src/sbackup/core/ConfigManager.py:622 #, python-format @@ -379,65 +390,65 @@ "Quando si imposta un certificato SSL o una chiave è obbligatorio inserire il " "certificato." -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Profilo predefinito" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Profilo sconosciuto" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "Illimitato" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "100 MiB" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "250 MiB" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "650 MiB" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "2 GiB (FAT16)" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "4 GiB (FAT32)" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Personalizzato" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Musica MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "Video AVI" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "Video MPEG" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Video Matrjoshka" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "Contenitore multimediale OGG" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Immagini CD" @@ -456,304 +467,235 @@ "File '%(filename)s' non trovati nella lista file immagine " "[%(snapshotname)s], Saltato." -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "Immagine «%s» non trovata " -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" "Immagine non valido `%(name)s` non trovato: Nome dell' immagine non valido." -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "Immagine non valido `%(name)s` non trovato: %(error_cause)s." -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "Non è necessario creare la nuova base di un'immagine completa «%s»" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" -"«%(snapshotToRebase)s» non ha un file «base», potrebbe essere danneggiato " - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" -"Impossibile creare la nuova base su un'immagine precedente: " -"«%(snapshotToRebase)s» <= «%(NewBaseSnapshot)s» " - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "Creare la nuova base «%(current)s» su «%(base)s»" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" -"Si è verificato un errore durante il prelevamento dell'immagine «%s»." - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "L'intestazione del file snar è incompleta." -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "Base dell'immagine «%s» non impostata." - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" "Immagine «%s» già completa, nulla da fare (non viene modificata in completa)." -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "Annullamento del prelevamento dell'immagine «%s»" - -#: src/sbackup/core/UpgradeManager.py:176 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Unable to remove upgrade stamp: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "Aggiornamento dalla versione 1.0 alla 1.2: %s" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "Aggiornamento alla versione 1.3: %s" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "Aggiornamento alla versione 1.4: %s" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "Aggiornamento alla versione 1.5: %s" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "Il file SNAR esiste già per lo snapshot '%s'. Non sarà sovrascritto." - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "Preparazione del processo di backup" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" -"Esistono snapshot in formati precedenti. Usare 'Simple Backup-Restoration' " -"se si vuole usarli, grazie." - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "Immagine «%(name)s» creata." -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "Base impostata a «%(value)s»." -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "File dei pacchetti impostato." -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "Problemi durante l'impostazione dell'elenco pacchetti: " -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "Impostazione file esclusi." -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "Impostare il formato di compressione a `%s`" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "Impostazione delle dimensioni dei pezzi di repertorio %s" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "L'opzione «Segui collegamenti simbolici» è abilitata." -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "L'opzione «Segui collegamenti simbolici» è disabilitata." -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "Lo snapshot è stato invitato." -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "Si sono verificati degli errori cancellando vecchi snapshots: %s" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "Backup completato." -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" "Sto inspezionando il file system per collezionare le informazioni sui files" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" -msgstr "" +msgstr "Riepilogo di backup" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "Numero di directory: %s." -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "Numero totale di file: %s." -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "Numero di collegamenti simbolici: %s." -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "Numero di file inclusi nell'immagine: %s." -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." -msgstr "" +msgstr "Numero di file saltati nell'immagine incrementale: %s." -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." -msgstr "" +msgstr "Numero di elementi forzati ad essere esclusi: %s" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." -msgstr "" +msgstr "Numero di oggetti da escludere come da configurazione: %s" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." -msgstr "" +msgstr "Lo spazio libero massimo richiesto è '%s'" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." -msgstr "" +msgstr "La dimensione dello spazio disponibile su disco è '%s'" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" +"Spazio disponibile non sufficiente nella directory per il backup pianificato " +"(libero: %(freespace)s, richiesto: %(neededspace)s)." -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" +"Impossibile copiare il registro. L'accesso al file non è inizializzato." -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" -msgstr "" +msgstr "Impossibile copiare il file di registro: %s" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "Impossibile trovare il logfile da copiare in snapshot." -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "Nessuna immagine per copiare il file di registro" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" +"Elaborazione del profilo è stata annullata su richiesta dell'utente\n" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" -msgstr "" +msgstr "Elaborazione del profilo terminato con successo (nessun errore)\n" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" -msgstr "" +msgstr "Elaborazione del profile non riuscita con errore: %s\n" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" -msgstr "" +msgstr "Destinazione del backup: %s" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." -msgstr "" +msgstr "Impossibile trovare la directory di destinazione." -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" +"Impossibile trovare la directory di destinazione anche dopo il nuovo " +"tentativo." -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "La directory di destinazione «%(target)s» non esiste." -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" -msgstr "" +msgstr "Impossibile accedere alla destinazione: %s" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " -msgstr "" +msgstr "L'immagine è inconsistente: _name non impostato " -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "Il nome dell'immagine «%s» non corrisponde ai requisiti" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " -msgstr "" +msgstr "L'immagine è inconsistente: __snapshotpath non impostato " -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " @@ -762,126 +704,132 @@ "Il formato di compressione delle immagini dovrebbe essere «%s», ma il file " "corrispondente non è stato trovato" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" +"%(file)s non contiene valori validi. Ignorata directory incompleta o non di " +"backup. " -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "Nome dell'immagine non valido: %s" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "Nome della base non valido: %s" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" -msgstr "" +msgstr "Nome dell'immagine non valido: %s" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" -msgstr "" +msgstr "Impossibile leggere il file obbligatorio \"ver\"" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." -msgstr "" +msgstr "Il nome di base deve essere impostato per il backup incrementale." #: src/sbackup/fs_backend/_fuse_fam.py:106 msgid "Initializing FUSE File Access Manager." -msgstr "" +msgstr "Inizializzazione del gestore di accesso ai file FUSE." #: src/sbackup/fs_backend/_fuse_fam.py:129 msgid "Terminating FUSE File Access Manager." -msgstr "" +msgstr "Chiusura del gestore di accesso ai file FUSE." -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" -msgstr "" +msgstr "SFTP" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" -msgstr "" +msgstr "SSH" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" -msgstr "" +msgstr "FTP" #: src/sbackup/fs_backend/_gio_fam.py:100 msgid "Initializing GIO File Access Manager." -msgstr "" +msgstr "Inizializzazione del gestore di accesso ai file GIO." #: src/sbackup/fs_backend/_gio_fam.py:114 msgid "Terminating GIO File Access Manager." +msgstr "Chiusura del gestore di accesso ai file GIO." + +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" -msgstr "" +msgstr "NFS" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" -msgstr "" +msgstr "SMB" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." -msgstr "" +msgstr "Il percorso è già montato." -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." -msgstr "" +msgstr "Il percorso non è montato." -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -889,6 +837,7 @@ #, python-format msgid "Unable to import plugin `%(plugin_name)s`: %(error_cause)s " msgstr "" +"Impossibile importare il plugin \"%(plugin_name)s\": %(error_cause)s " #: src/sbackup/fuse_plugins/ftpFuseFAM.py:117 #, python-format @@ -907,7 +856,7 @@ #: src/sbackup/fuse_plugins/ftpFuseFAM.py:141 msgid "FTP schema is: ftp://user:pass@server/anything" -msgstr "" +msgstr "Lo schema FTP è: ftp://utente:password@server/qualcosa" #: src/sbackup/fuse_plugins/ftpFuseFAM.py:188 #, python-format @@ -985,10 +934,9 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" -msgstr "" +msgstr "Errore di Simple Backup" #: src/sbackup/ui/GladeWindow.py:213 msgid "Unable to access backup destination" @@ -996,7 +944,7 @@ #: src/sbackup/ui/configgui.py:125 msgid "Scheduled backups are available for Administrator users only." -msgstr "" +msgstr "I backup programmati sono disponibili solo per gli amministratori." #: src/sbackup/ui/configgui.py:135 src/sbackup/ui/configgui.py:144 msgid "Name" @@ -1019,6 +967,8 @@ msgid "" "Invalid or empty regular expression ('%s') found in configuration. Removed." msgstr "" +"Espressione regolare (\"%s\") vuota o non valida trovata nella " +"configurazione. Rimossa." #: src/sbackup/ui/configgui.py:292 #, python-format @@ -1030,6 +980,12 @@ "These expressions are not used and were\n" "removed from the configuration." msgstr "" +"Espressioni regolari vuote o non valide trovate\n" +"nel file di configurazione:\n" +"\"%s\"\n" +"\n" +"Queste espressioni non sono state usate e sono\n" +"state rimosse dalla configurazione." #: src/sbackup/ui/configgui.py:548 msgid "" @@ -1047,6 +1003,11 @@ "Attention: The target will be set to the default value. Check this on the " "destination settings page before saving the configuration." msgstr "" +"La destinazione del backup \"%s\" non esiste.\n" +"\n" +"Attenzione: la destinazione dovrà essere impostata al valore predefinito. " +"Controllare questi parametri nella pagina delle impostazioni della " +"destinazione prima di salvare la configurazione." #: src/sbackup/ui/configgui.py:551 msgid "Unable to open backup target" @@ -1063,11 +1024,19 @@ "\n" "Important note: Saving will overwrite your existing invalid configuration." msgstr "" +"%s\n" +"\n" +"È stato creato un profilo di backup usando i valori predefiniti. Salvare la " +"nuova configurazione per utilizzarla o controllare manualmente il file di " +"configurazione esistente.\n" +"\n" +"Nota importante: il salvataggio sovrascriverà la configurazione non valida " +"esistente." #: src/sbackup/ui/configgui.py:641 #, python-format msgid "Current profile: %s" -msgstr "" +msgstr "Profilo attuale: %s" #: src/sbackup/ui/configgui.py:732 msgid "Already included item !" @@ -1095,10 +1064,12 @@ "It seems the path you entered does not exists. Do you want to add this " "incorrect path?" msgstr "" +"Sembra che il percorso selezionato non esista. Aggiungere questo percorso " +"non corretto?" #: src/sbackup/ui/configgui.py:820 msgid "Save configuration as..." -msgstr "" +msgstr "Salva la configurazione come..." #: src/sbackup/ui/configgui.py:887 msgid "" @@ -1107,10 +1078,14 @@ "You can monitor the progress of the backup by means of the status indicator " "displayed in the notification area." msgstr "" +"Un processo di backup è ora eseguito in background.\n" +"\n" +"È possibile controllarne l'avanzamento utilizzando l'indicatore di stato " +"mostrato nell'area di notifica." #: src/sbackup/ui/configgui.py:888 msgid "Backup process started" -msgstr "" +msgstr "Processo di backup avviato" #: src/sbackup/ui/configgui.py:893 src/sbackup/ui/configgui.py:1661 #: src/sbackup/ui/configgui.py:2038 @@ -1284,126 +1259,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1412,77 +1381,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1511,7 +1480,7 @@ msgid "Restore..." msgstr "Ripristina..." -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "Ripristina come..." @@ -1519,12 +1488,12 @@ msgid "Revert..." msgstr "Reimposta..." -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "Reimposta come..." #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1600,11 +1569,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1630,58 +1599,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "La versione dell'immagine è superiore a quella supportata." - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "Impossibile aggiornare l'immagine" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "Creare la nuova base «%(current)s» su «%(base)s»?" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1690,22 +1607,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1714,35 +1631,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "Ripristino del file selezionato" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "Ripristino di «%s» in corso." -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1750,7 +1667,7 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1759,14 +1676,14 @@ "Ripristino di «%(source)s»\n" "in «%(dirname)s» in corso." -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1775,21 +1692,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "Reimpostazione dei file selezionati" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "Reimpostazione di «%s» in corso.\n" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1797,7 +1714,7 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1806,14 +1723,14 @@ "Reimpostazione di «%(source)s»\n" "in «%(dirname)s» in corso." -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1844,67 +1761,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -1943,7 +1855,7 @@ #: data/ui/sbackup-config.glade:163 msgid "Exclude by regex" -msgstr "Escludere con una espressione regolare" +msgstr "Escludi con espressione regolare" #: data/ui/sbackup-config.glade:180 msgid "" @@ -2149,7 +2061,7 @@ #: data/ui/sbackup-config.glade:1671 data/ui/sbackup-config.glade:1919 msgid "Add Directory" -msgstr "Aggiungi directory" +msgstr "Aggiungi cartella" #: data/ui/sbackup-config.glade:1718 msgid "Include" @@ -2169,7 +2081,7 @@ #: data/ui/sbackup-config.glade:2109 msgid "File types" -msgstr "Tipi di file" +msgstr "Formati dei file" #: data/ui/sbackup-config.glade:2267 msgid "" @@ -2207,7 +2119,7 @@ #: data/ui/sbackup-config.glade:2500 msgid "Select the destination folder" -msgstr "Selezionare la cartella di destinazione" +msgstr "Seleziona cartella di destinazione" #: data/ui/sbackup-config.glade:2526 msgid "Use a remote site" @@ -2443,6 +2355,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Ripristina file e directory" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Cartella da cui ripristinare" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Backup disponibili:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Personalizzata:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Predefinita:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "File e cartelle da ripristinare" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Ripristina" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Ripristina come..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2495,289 +2456,131 @@ msgid "Delete" msgstr "Elimina" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "Aggiorna" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "Storia dell'immagine" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "Selezionare un'immagine nell'elenco per creare la nuova base." -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "Creare la nuova base" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "Gestione immagine" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Ripristina" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "Reimposta" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "Gestione ripristino" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "Gestione esportazione" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "Intestazione" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "Contenuto" -#~ msgid "Failed to set the gid to 'admin' one :" -#~ msgstr "Impostazione del gid amministrativo non riuscita:" - -#~ msgid "Target not writeable: " -#~ msgstr "Oggetto non riscrivibile: " - -#~ msgid "Invalid value of the target directory : " -#~ msgstr "Valore non valido della directory di destinazione: " - -#~ msgid "" -#~ "Got a non valid snapshot '%(name)s' due to name convention : %(error_cause)s " -#~ msgstr "" -#~ "Ottenuta un'immagine non valida «%(name)s» a causa della convenzione sul " -#~ "nome: %(error_cause)s " - -#~ msgid "Cannot downgrade other format than 'gzip' to 1.4" -#~ msgstr "Impossibile riporatre alla versione 1.4 formati che non siano «gzip»" - -#~ msgid "'%d' test(s) didn't succeed !" -#~ msgstr "La prova «%d» non ha avuto successo." - -#~ msgid "Test Succeeded !" -#~ msgstr "Prova superata con successo." - -#~ msgid "Target directory is writable." -#~ msgstr "È possibile scrivere nella directory di destinazione." - -#~ msgid "" -#~ "Please change target directory and test writability of the target directory " -#~ "by pressing \"Test\" button on the right." -#~ msgstr "" -#~ "Cambiare la directory di destinazione e controllare di avere i permessi di " -#~ "scrittura facendo clic sul pulsante «Prova» sulla destra." - -#~ msgid "disable" -#~ msgstr "disabilita" - -#~ msgid "" -#~ "You can't %s the Default Profile. Please use it if you need only one profile." -#~ msgstr "" -#~ "Non puoi %s il Profilo di Default. Per favore, usa, se ne hai bisogno, solo " -#~ "un profilo." - -#~ msgid "Actual base : %s" -#~ msgstr "Base attuale: %s" - -#~ msgid "" -#~ "Choose the compression format that you want to apply.\n" -#~ "Default is gzip." -#~ msgstr "" -#~ "Scegliere il formato di compressione da appllicare.\n" -#~ "Quello predefinito è gzip." +#, python-format +#~ msgid "No need to rebase a full snapshot '%s'" +#~ msgstr "Non è necessario creare la nuova base di un'immagine completa «%s»" +#, python-format #~ msgid "" -#~ "Select the directory in which you have your backups.\n" -#~ "You can use a local or distant directory depending on the " -#~ "plugins you have installed." -#~ msgstr "" -#~ "Selezionare la directory in cui si trovano i backup.\n" -#~ "È possibile utilizzare una directory locale o remota a seconda " -#~ "dei plugin installati." - -#~ msgid "Use the default directory : " -#~ msgstr "Utilizzare la directory predefinita : " - -#~ msgid "Use a custom directory : " -#~ msgstr "Utilizzare una directory personalizzata : " - -#~ msgid "Snapshots directory" -#~ msgstr "Directory delle immagini" - -#~ msgid "Restore As" -#~ msgstr "Ripristina come" - -#~ msgid "Revert As" -#~ msgstr "Reimposta come" - -#~ msgid "Choose to upgrade your snapshot if needed." -#~ msgstr "Scegliere di aggiornare l'immagine se necessario." - -#~ msgid "Actual base :" -#~ msgstr "Base attuale:" - -#~ msgid "Select a snapshot and change its base to another snapshot." -#~ msgstr "Selezionare un'immagine e cambiarne la base a un'altra." - -#~ msgid "Parameters" -#~ msgstr "Parametri" - -#~ msgid "This is a user friendly backup solution for common desktop needs." -#~ msgstr "È un'applicazione di facile utilizzo per creare copie di backup." - -#~ msgid "sbackup configuration error" -#~ msgstr "Errore di configurazione di sbackup" - -#~ msgid "Unable to change permissions for " -#~ msgstr "Impossibile cambiare i permessi per " - -#~ msgid "I didn't find the log file. Please set it up in sbackup.conf " -#~ msgstr "" -#~ "Impossibile trovare il file del registro. Impostarlo in sbackup.conf " - -#~ msgid "Choose the SSL option (smtptls=1) to be able to use Cert and Key" +#~ "'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " #~ msgstr "" -#~ "Scegliere l'opzione SSL (smtptls=1) per poter utilizzare certificato e chiave" - -#~ msgid "Save to file ..." -#~ msgstr "Salvare nel file..." - -#~ msgid "Starting snapshot %(name)s " -#~ msgstr "Avvio dell'immagine %(name)s " - -#~ msgid "gtk-no" -#~ msgstr "gtk-no" - -#~ msgid "gtk-yes" -#~ msgstr "gtk-yes" - -#~ msgid "Test all" -#~ msgstr "Prova tutto" +#~ "«%(snapshotToRebase)s» non ha un file «base», potrebbe essere danneggiato " +#, python-format #~ msgid "" -#~ "When setting a username (resp password), password (resp username) is " -#~ "mandatory" -#~ msgstr "" -#~ "Quando si imposta nome utente o password è obbligatorio inserire entrambi" - -#~ msgid "No directory to backup !" -#~ msgstr "Nessuna directory per il backup." - -#~ msgid "Target '%s' directory is excluded" -#~ msgstr "La directory di destinazione «%s» è esclusa" - -#~ msgid "'%(file)s' doesn't exist, it has to be exclude " -#~ msgstr "«%(file)s» non esiste, è da escludere " - -#~ msgid "Initializing FUSE FILE ACCESS MANAGER !" -#~ msgstr "Avvio gestore di accesso al file fuse." - -#~ msgid "Got an exception when Pulling '%s' : " -#~ msgstr "Ottenuta una eccezione prelevando «%s»: " - -#~ msgid "Deleting '%(snp)s' for purge !" -#~ msgstr "Eliminazione «%(snp)s» per pulizia." - -#~ msgid "Couldn't make a proper backup : " -#~ msgstr "Impossibile fare un backup corretto: " - -#~ msgid "Snapshot '%s' is a full . Can't rebase on older snapshot" +#~ "Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " +#~ "'%(NewBaseSnapshot)s' " #~ msgstr "" -#~ "L'immagine «%s» è piena. Impossibile creare la nuova base su un'immagine " -#~ "precedente" - -#~ msgid "Terminating FUSE FILE ACCESS MANAGER !" -#~ msgstr "Chiusura gestore di accesso al file fuse." - -#~ msgid "Problem with '%(file)s' : %(error)s " -#~ msgstr "Problema con «%(file)s» : %(error)s " +#~ "Impossibile creare la nuova base su un'immagine precedente: " +#~ "«%(snapshotToRebase)s» <= «%(NewBaseSnapshot)s» " -#~ msgid "Non existing directory : %s" -#~ msgstr "Directory inesistente: %s" - -#~ msgid "gtk-remove" -#~ msgstr "gtk-remove" - -#~ msgid "gtk-add" -#~ msgstr "gtk-add" +#, python-format +#~ msgid "Rebasing '%(current)s' on '%(base)s'" +#~ msgstr "Creare la nuova base «%(current)s» su «%(base)s»" -#~ msgid "gtk-close" -#~ msgstr "gtk-close" +#, python-format +#~ msgid "Cancelling pull of snapshot '%s'" +#~ msgstr "Annullamento del prelevamento dell'immagine «%s»" -#~ msgid "gtk-edit" -#~ msgstr "gtk-edit" +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "Aggiornamento dalla versione 1.0 alla 1.2: %s" -#~ msgid "" -#~ "Please enter the new profile name in the Profile name entry and check " -#~ "the Enable checkbox to enable it." -#~ msgstr "" -#~ "Inserire il nuovo nome del profilo nella casella Nome profilo e " -#~ "selezionare Abilita per attivarlo." +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "Aggiornamento alla versione 1.3: %s" -#~ msgid "gtk-ok" -#~ msgstr "gtk-ok" +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "Aggiornamento alla versione 1.4: %s" -#~ msgid "gtk-cancel" -#~ msgstr "gtk-cancel" +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "Aggiornamento alla versione 1.5: %s" -#~ msgid "Time (for admins only)" -#~ msgstr "Ora (solo per gli amministratori)" +#~ msgid "The version of the snapshot is greater than the supported one!" +#~ msgstr "La versione dell'immagine è superiore a quella supportata." -#~ msgid "Log settings" -#~ msgstr "Impostazioni del registro" +#~ msgid "Unable to upgrade snapshot" +#~ msgstr "Impossibile aggiornare l'immagine" -#~ msgid "Security" -#~ msgstr "Sicurezza" +#, python-format +#~ msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" +#~ msgstr "Creare la nuova base «%(current)s» su «%(base)s»?" -#~ msgid "" -#~ "We don't have read access to '%(file)s', it has to be exclude : %(error)s " -#~ msgstr "" -#~ "Impossibile accedere in lettura a «%(file)s», è da escludere : %(error)s " +#~ msgid "Upgrade" +#~ msgstr "Aggiorna" -#~ msgid "" -#~ "'%(file)s' size is higher than the specified one ( %(filesize)s > " -#~ "%(maxsize)s), it has to be exclude " +#, python-format +#~ msgid "An error occurred when pulling snapshot '%s'." #~ msgstr "" -#~ "«%(file)s» ha una dimensione maggiore di quella specificata (%(filesize)s > " -#~ "%(maxsize)s), è da escludere " +#~ "Si è verificato un errore durante il prelevamento dell'immagine «%s»." -#~ msgid "Set the reciever of this mail" -#~ msgstr "Impostare il destinatario di questa mail" +#, python-format +#~ msgid "Base of snapshot '%s' is not set." +#~ msgstr "Base dell'immagine «%s» non impostata." #~ msgid "" -#~ "Debug is just for debbuging purpose\n" -#~ "Info is the recommended setting" +#~ "There are snapshots stored in outdated snapshot formats. Please upgrade them " +#~ "using 'Simple Backup-Restoration' if you want to use them." #~ msgstr "" -#~ "Debug è solo per il debug\n" -#~ "L'impostazione raccomandata è Info" +#~ "Esistono snapshot in formati precedenti. Usare 'Simple Backup-Restoration' " +#~ "se si vuole usarli, grazie." -#~ msgid "Terminating FUSE FILE ACCESS MANAGER!" -#~ msgstr "In chiusura MANAGER ACCESSO FILE FUSO!" +#, python-format +#~ msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." +#~ msgstr "Il file SNAR esiste già per lo snapshot '%s'. Non sarà sovrascritto." diff -Nru sbackup-0.11.4/po/ja.po sbackup-0.11.6/po/ja.po --- sbackup-0.11.4/po/ja.po 2011-02-13 18:22:18.000000000 +0100 +++ sbackup-0.11.6/po/ja.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" -"PO-Revision-Date: 2010-10-05 13:28+0000\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" +"PO-Revision-Date: 2011-02-06 11:43+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,57 +42,60 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "メンテナ:" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "以前のメンテナ:" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "貢献者:" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" -" Hiroshi Tagawa https://launchpad.net/~kuponuga" +" Hajime Mizuno https://launchpad.net/~mizuno-as\n" +" Hiroshi Tagawa https://launchpad.net/~kuponuga\n" +" Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" +" Jun Kobayashi https://launchpad.net/~jkbys" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -104,131 +107,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -338,65 +341,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "カスタム" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3 音楽" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI ビデオ" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG ビデオ" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matrjoshka ビデオ" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "OGG マルチメディア" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "CD イメージ" @@ -412,328 +415,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.3: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -745,18 +679,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -768,65 +702,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -916,8 +854,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1212,126 +1149,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1340,77 +1271,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1439,7 +1370,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1447,12 +1378,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1528,11 +1459,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1558,58 +1489,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1618,22 +1497,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1642,35 +1521,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1678,21 +1557,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1701,21 +1580,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1723,21 +1602,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1768,67 +1647,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2382,6 +2256,55 @@ msgid "Make a full backup" msgstr "完全バックアップを作成" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "復元するファイル/フォルダ" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "復元元フォルダ" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "利用可能なバックアップ:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "カスタム:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "デフォルト:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "復元するファイル" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "復元" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "別の場所へ" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "バックアップフォルダ" @@ -2434,68 +2357,56 @@ msgid "Delete" msgstr "削除" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "復元" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "復元の管理" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/kk.po sbackup-0.11.6/po/kk.po --- sbackup-0.11.4/po/kk.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/kk.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:36+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Kazakh \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,55 +42,57 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" arruah https://launchpad.net/~arruah" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -102,131 +104,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -336,65 +338,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Өзім қалаған" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "" @@ -410,328 +412,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Cancelling pull of snapshot '%s'" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -743,18 +676,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -766,65 +699,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -914,8 +851,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1210,126 +1146,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1338,77 +1268,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1437,7 +1367,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1445,12 +1375,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1526,11 +1456,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1556,58 +1486,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1616,22 +1494,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1640,35 +1518,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1676,21 +1554,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1699,21 +1577,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1721,21 +1599,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1766,67 +1644,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2357,6 +2230,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Қалпына келтіру" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2409,68 +2331,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Қалпына келтіру" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/ko.po sbackup-0.11.6/po/ko.po --- sbackup-0.11.4/po/ko.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/ko.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:21+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,55 +42,58 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" Bundo https://launchpad.net/~kang-bundo\n" +" jongjun https://launchpad.net/~whdwnsdl" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -102,131 +105,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -336,65 +339,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "사용자 설정" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3 음악" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI 비디오" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG 비디오" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matrjoshka 비디오" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "OGG 멀티미디어 컨테이너" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "CD 이미지" @@ -410,328 +413,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.3: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -743,18 +677,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -766,65 +700,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -914,8 +852,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1210,126 +1147,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1338,77 +1269,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1437,7 +1368,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1445,12 +1376,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1526,11 +1457,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1556,58 +1487,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1616,22 +1495,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1640,35 +1519,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1676,21 +1555,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1699,21 +1578,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1721,21 +1600,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1766,67 +1645,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2359,6 +2233,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "복원할 파일/폴더" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "복원할 원본 폴더" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "사용 가능한 백업:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "사용자 지정 사용:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "기본값 사용:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "복원할 파일과 폴더" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "복원" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "다른 위치에 복원..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2411,68 +2334,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "복원" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/kw.po sbackup-0.11.6/po/kw.po --- sbackup-0.11.4/po/kw.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/kw.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:41+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Cornish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:46+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,55 +42,57 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" Christian Semmens https://launchpad.net/~christian-semmens" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -102,131 +104,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -336,65 +338,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Ylow MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "" @@ -410,328 +412,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Cancelling pull of snapshot '%s'" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -743,18 +676,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -766,65 +699,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -914,8 +851,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1210,126 +1146,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1338,77 +1268,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1437,7 +1367,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1445,12 +1375,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1526,11 +1456,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1556,58 +1486,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1616,22 +1494,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1640,35 +1518,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1676,21 +1554,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1699,21 +1577,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1721,21 +1599,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1766,67 +1644,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2357,6 +2230,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2409,68 +2331,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/lv.po sbackup-0.11.6/po/lv.po --- sbackup-0.11.4/po/lv.po 2011-02-13 18:22:17.000000000 +0100 +++ sbackup-0.11.6/po/lv.po 2013-09-17 20:50:00.000000000 +0200 @@ -8,17 +8,17 @@ msgstr "" "Project-Id-Version: SBackup 0.10\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-09-25 00:09+0000\n" "Last-Translator: Aigars Mahinovs \n" "Language-Team: Latvian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -28,7 +28,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -43,53 +43,53 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Latviešu tulkojums: Aigars Mahinovs\n" @@ -107,131 +107,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -341,65 +341,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Specifisks" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3 mūzika" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI video" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG video" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matrjoshka video" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "OGG multimedijas konteineris" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "CD attēlfaili" @@ -415,328 +415,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.3: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -748,18 +679,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -771,65 +702,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -919,8 +854,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1215,126 +1149,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1343,77 +1271,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1442,7 +1370,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1450,12 +1378,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1531,11 +1459,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1561,58 +1489,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1621,22 +1497,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1645,35 +1521,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1681,21 +1557,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1704,21 +1580,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1726,21 +1602,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1771,67 +1647,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2368,6 +2239,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Atjaunot failus/mapes" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Atjaunošanas Avots" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Pieejamās rezerves kopijas:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Ipašs:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Pēc noklusējuma" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Atjaunojamie Faili un Mapes" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Atjaunot" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Atjaunot kā ..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2420,68 +2340,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Atjaunot" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/ms.po sbackup-0.11.6/po/ms.po --- sbackup-0.11.4/po/ms.po 2011-02-13 18:22:17.000000000 +0100 +++ sbackup-0.11.6/po/ms.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:42+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Malay \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,59 +42,62 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Kredit-Penterjemah\n" "\n" "Launchpad Contributions:\n" -" Jean-Peer Lorenz https://launchpad.net/~peer.loz" +" Alexander Simbun https://launchpad.net/~pop-alex-deactivatedaccount\n" +" Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" +" abuyop https://launchpad.net/~abuyop\n" +" alHakim https://launchpad.net/~nurhakim" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -106,131 +109,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -340,67 +343,67 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" -msgstr "" +msgstr "Suai" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Muzik MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "Video AVI" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "Video MPEG" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Video Matrjoshka" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" -msgstr "" +msgstr "Bekas Multimedia OGG" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" -msgstr "" +msgstr "Imej CD" #: src/sbackup/core/RestoreManager.py:80 #, python-format @@ -414,328 +417,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -747,18 +681,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -770,65 +704,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -918,8 +856,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1002,15 +939,15 @@ #: src/sbackup/ui/configgui.py:732 msgid "Already included item !" -msgstr "" +msgstr "Item telah disertakan !" #: src/sbackup/ui/configgui.py:747 msgid "Already excluded item !" -msgstr "" +msgstr "Item sudah diasingkan !" #: src/sbackup/ui/configgui.py:759 src/sbackup/ui/configgui.py:1458 msgid "Empty expression. Please enter a valid regular expression." -msgstr "" +msgstr "Ungkapan kosong. Sila masuk masukkan ungkapan nalar yang sah." #: src/sbackup/ui/configgui.py:774 src/sbackup/ui/configgui.py:1472 msgid "Provided regular expression is not valid." @@ -1019,6 +956,7 @@ #: src/sbackup/ui/configgui.py:782 msgid "Empty filename or path. Please enter a valid filename or path." msgstr "" +"Nama fail atau laluan kosong. Sila masukkan nama fail atau laluan yang sah." #: src/sbackup/ui/configgui.py:791 msgid "" @@ -1214,126 +1152,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1342,77 +1274,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1441,7 +1373,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1449,12 +1381,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1492,7 +1424,7 @@ #: src/sbackup/ui/restoregui.py:388 msgid "Choose a source folder" -msgstr "" +msgstr "Pilih folder sumber" #: src/sbackup/ui/restoregui.py:405 msgid "Reading snapshots..." @@ -1504,7 +1436,7 @@ #: src/sbackup/ui/restoregui.py:458 src/sbackup/ui/restoregui.py:496 msgid "Loading ..." -msgstr "" +msgstr "Memuatkan ..." #: src/sbackup/ui/restoregui.py:539 msgid "Reading files from snapshot..." @@ -1530,16 +1462,16 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 msgid "Select restore location" -msgstr "" +msgstr "Pilih lokasi pemulihan" #: src/sbackup/ui/restoregui.py:662 #, python-format @@ -1560,58 +1492,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1620,22 +1500,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1644,35 +1524,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1680,21 +1560,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1703,21 +1583,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1725,21 +1605,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1770,67 +1650,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -1857,25 +1732,27 @@ #: data/ui/sbackup-config.glade:26 msgid "Standard file types:" -msgstr "Jenis file standard:" +msgstr "Jenis fail piawai:" #: data/ui/sbackup-config.glade:63 msgid "Custom defined file type with " -msgstr "" +msgstr "Suaikan jenis fail tertakrif dengan " #: data/ui/sbackup-config.glade:93 msgid "file extension" -msgstr "sambungan file" +msgstr "sambungan fail" #: data/ui/sbackup-config.glade:163 msgid "Exclude by regex" -msgstr "Dikecualikan oleh regex" +msgstr "Dikecualikan oleh ungkapan nalar" #: data/ui/sbackup-config.glade:180 msgid "" "Enter a regular expression.\n" "Files and directories matching this expression will be excluded from backup." msgstr "" +"Masukkan ungkapan nalar.\n" +"Fail dan direktori yang memadani ungkapan ini akan diasingkan dari sandar." #: data/ui/sbackup-config.glade:257 msgid "Enter the remote target to include" @@ -1936,7 +1813,7 @@ #: data/ui/sbackup-config.glade:915 data/ui/sbackup-restore.glade:7 msgid "Simple Backup Suite" -msgstr "" +msgstr "Suit Sandar Ringkas" #: data/ui/sbackup-config.glade:932 msgid "_File" @@ -2016,7 +1893,7 @@ #: data/ui/sbackup-config.glade:1330 msgid "Do a full backup at least once every" -msgstr "" +msgstr "Buat sandar penuh sekurang-kurangnya setiap" #: data/ui/sbackup-config.glade:1339 msgid "" @@ -2052,7 +1929,7 @@ #: data/ui/sbackup-config.glade:1475 msgid "General" -msgstr "" +msgstr "Am" #: data/ui/sbackup-config.glade:1495 msgid "Included files and directories" @@ -2065,15 +1942,15 @@ #: data/ui/sbackup-config.glade:1620 data/ui/sbackup-config.glade:1868 msgid "Add File" -msgstr "" +msgstr "Tambah Fail" #: data/ui/sbackup-config.glade:1671 data/ui/sbackup-config.glade:1919 msgid "Add Directory" -msgstr "" +msgstr "Tambah Direktori" #: data/ui/sbackup-config.glade:1718 msgid "Include" -msgstr "" +msgstr "Sertakan" #: data/ui/sbackup-config.glade:1739 msgid "Excluded files and directories" @@ -2081,7 +1958,7 @@ #: data/ui/sbackup-config.glade:1952 msgid "Paths" -msgstr "" +msgstr "Laluan" #: data/ui/sbackup-config.glade:2074 data/ui/sbackup-config.glade:2232 msgid "Add" @@ -2089,7 +1966,7 @@ #: data/ui/sbackup-config.glade:2109 msgid "File types" -msgstr "" +msgstr "Jenis fail" #: data/ui/sbackup-config.glade:2267 msgid "" @@ -2123,7 +2000,7 @@ #: data/ui/sbackup-config.glade:2472 msgid "Use custom local backup directory" -msgstr "Gunakan direktori simpanan tempatan sendiri" +msgstr "Guna direktori sandar setempat suai" #: data/ui/sbackup-config.glade:2500 msgid "Select the destination folder" @@ -2135,7 +2012,7 @@ #: data/ui/sbackup-config.glade:2568 msgid "ssh://username:password@example.com/remote/dir/" -msgstr "" +msgstr "ssh://namapengguna:katalaluan@contoh.com/remote/dir/" #: data/ui/sbackup-config.glade:2580 msgid "Connect..." @@ -2149,7 +2026,7 @@ #: data/ui/sbackup-config.glade:2704 msgid "Destination" -msgstr "" +msgstr "Destinasi" #: data/ui/sbackup-config.glade:2725 msgid "_No scheduled backups" @@ -2232,14 +2109,17 @@ "Note: Additionally all incomplete and irrecoverable backups will be " "erased as long as there is a complete backup snapshot made later on." msgstr "" +"Perhatian: Semua sandar tidak lengkap dan tidak boleh dipulihkan anda " +"dipadam sebaik sahaja terdapat petikan lengkap yang dibuat dikemudian " +"hari." #: data/ui/sbackup-config.glade:3184 msgid "Purging" -msgstr "" +msgstr "Menyingkir" #: data/ui/sbackup-config.glade:3186 msgid "Cleaning old backups" -msgstr "Bersihkan simpanan lama" +msgstr "Bersihkan sandar lama" #: data/ui/sbackup-config.glade:3209 msgid "Logging" @@ -2361,6 +2241,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Pulihkan fail/direktori" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Pulih Folder Sumber" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Sandar tersedia:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Guna suai:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Gunakan lalai:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Fail dan Folder untuk dipulihkan" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Pulih" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Pulih Sebagai..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2413,68 +2342,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/nb.po sbackup-0.11.6/po/nb.po --- sbackup-0.11.4/po/nb.po 2011-02-13 18:22:17.000000000 +0100 +++ sbackup-0.11.6/po/nb.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" -"PO-Revision-Date: 2010-10-05 13:30+0000\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" +"PO-Revision-Date: 2011-02-06 11:46+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Norwegian Bokmal \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -45,27 +45,27 @@ "\n" "Fortsetter å prosessere gjenværende filer." -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "Sikkerhetskopiering ble stoppet av bruker." -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "Det oppsto en feil under kansellering av sikkerhetskopiering:" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "Det oppsto en feil under lagring:" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "Klarte ikke å sende epost:" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "Følgende feil oppsto før:" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" @@ -74,7 +74,7 @@ "Sikkerhetskopiering ikke startet.\n" "%s" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " @@ -84,24 +84,28 @@ "ønsker å hjelpe til ved å rapportere feil, oversette eller noe annet, besøk " "nettstedet vårt." -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "Ansvarlige:" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "Tidligere ansvarlige:" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "Bidragsytere:" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" +"oversettere\n" +"\n" "Launchpad Contributions:\n" +" Christoffer Heggem https://launchpad.net/~ch-fu3\n" " Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" -" KaiO https://launchpad.net/~kaio-okai" +" KaiO https://launchpad.net/~kaio-okai\n" +" Karl Eivind Dahl https://launchpad.net/~foralle.org" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -113,58 +117,58 @@ msgid "Effective path for `%s` is not available" msgstr "Stien til `%s` er ikke tilgjengelig" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "Klarte ikke å finne stien til `%s`" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "Det er for tiden ikke mulig å kombinere oppdeling med kompresjon." -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "Klarte ikke å endre rettighetene for fila '%s'." -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "Klarte ikke å slette den midlertidige fila `%(file)s`: %(error)s" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" "Åpner komprimeringsprogrammet TAR for å lage inkrementell sikkerhetskopi." -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "Klarte ikke å finne SNAR-fil for å lage inkrementell sikkerhetskopi" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "Går tilbake til full sikkerhetskopiering." -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "Åpner komprimeringsprogrammet TAR for å lage full sikkerhetskopi." -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "Skråstrek '/' foran navn ble fjernet." -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "Skråstrek '/' foran lenkemål ble fjernet." -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" @@ -173,16 +177,16 @@ "Komprimeringsprogrammet TAR rapporterte:\n" "%s" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "Komprimeringsprogrammet TAR avsluttet korrekt." -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "Komprimeringsprogrammet TAR sendte en advarsel: %s" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" @@ -191,61 +195,61 @@ "Komprimeringsprogrammet TAR sendte advarslene:\n" "%s" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" "Komprimeringsprogrammet TAR sendte advarsler men avsluttet uten problemer." -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" "Klarte ikke å avslutte korrekt. Komprimeringsprogrammet TAR avsluttet med " "feil." -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "Klarte ikke å avslutte bakgrunnsprosessen: %s" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "Inkludert" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "Uendret" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "Mappe/folder" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "Linja må være tekst (streng)" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -355,65 +359,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Ukjent profil" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "Ubegrenset" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "100 MiB" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "250 MiB" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "650 MiB" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "2 GiB (FAT16)" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "4 GiB (FAT32)" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Alternativ" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3 -Musikk" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI -Video" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG -Video" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matroska -Video" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "OGG Multimediabeholder" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "CD-Speilinger" @@ -429,329 +433,260 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "Plassering av sikkerhetskopi: %s" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "Klarte ikke å finne plassering for sikkerhetskopi." -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" "Klarte ikke å finne plassering for sikkerhetskopi (forsøkte flere ganger)." -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "Folder/mappe '%(target)s' finnes ikke." -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "Fikk ikke tilgang til: %s" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -763,18 +698,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -786,65 +721,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -934,8 +873,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1231,126 +1169,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1359,77 +1291,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1458,7 +1390,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1466,12 +1398,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1547,11 +1479,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1577,58 +1509,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1637,22 +1517,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1661,35 +1541,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1697,21 +1577,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1720,21 +1600,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1742,21 +1622,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1787,67 +1667,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2384,6 +2259,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Gjenopprett filer/mapper" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Gjenopprett Kildemappe" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Tilgjengelige sikkerhetskopier:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Bruk egendefinert:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Bruk standard:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Filer og Mapper å igjenopprette" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Gjenopprett" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Gjenopprett som..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2436,68 +2360,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Gjenopprett" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "Overskrift" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "Innhold" diff -Nru sbackup-0.11.4/po/nl.po sbackup-0.11.6/po/nl.po --- sbackup-0.11.4/po/nl.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/nl.po 2013-09-17 20:50:00.000000000 +0200 @@ -8,17 +8,17 @@ msgstr "" "Project-Id-Version: nssbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:32+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:37+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:46+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "SBackup Daemon <%(login)s@%(hostname)s>" @@ -28,7 +28,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "[SBackup] [%(profile)s] Rapport van %(date)s" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "Geen logbestand opgegeven." @@ -47,27 +47,27 @@ "\n" "Verder gaan met de overige profielen." -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "Backup werd afgebroken door gebruiker." -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "Er deed zich een fout voor tijdens het annuleren van de backup." -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" -msgstr "Fout opgetreden tijdens de backup" +msgstr "Er is een fout opgetreden tijdens het maken van de back-up:" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "Fout opgetreden tijdens het verzenden van email" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "De volgende fout(en) kwamen eerder voor:" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" @@ -76,7 +76,7 @@ "Backup werd niet gestart\n" "%s" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " @@ -86,25 +86,29 @@ "u wilt bijdragen middels het doorgeven van bugs, vertalingen of anderzins " "bezoek dan onze webpagina" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" -msgstr "" +msgstr "Ontwikkelaars:" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" -msgstr "" +msgstr "Voorheen ontwikkeld door:" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "Bijdragen van:" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Vertaald door\n" "\n" "Launchpad Contributions:\n" -" Jean-Peer Lorenz https://launchpad.net/~peer.loz" +" Frederik https://launchpad.net/~frederik-debuck\n" +" Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" +" Mark Van den Borre https://launchpad.net/~markvdb\n" +" Philip I.J.H. https://launchpad.net/~philip-hoflack\n" +" Tico https://launchpad.net/~co-ti" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -116,57 +120,61 @@ msgid "Effective path for `%s` is not available" msgstr "Opgegeven pad voor `%s` niet beschikbaar" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "Kan opgegeven pad voor `%s` niet beschikbaar" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" +"Op het moment is de split-functionaliteit niet compatibel met de compress-" +"optie." -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "Permissies veranderen voor bestand '%s' is mislukt." -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "Kan tijdelijk bestand niet verwijderen `%(file)s`: %(error)s" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." -msgstr "" +msgstr "Bezig met het starten van TAR om een incremental backup te maken." -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" +"Kan het SNAR-bestand niet vinden die nodig is om een incremental backup te " +"maken." -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "Er wordt teruggevallen op volledige backup" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "TAR wordt gestart voor het maken van een volledige backup." -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "De voorloop '/' voor de gebruikersnamen zijn verwijderd" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "De voorloop '/' voor de hard link doelpad zijn verwijderd" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "TAR gaf de volgende melding: %s" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" @@ -175,16 +183,16 @@ "TAR gaf de voldende meldingen:\n" "%s" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "TAR succesvol beeindigd." -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "TAR gaf de volgende waarschuwing: %s" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" @@ -193,60 +201,60 @@ "TAR gaf de volgende meldingen:\n" "%s" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "TAR gaf waarschuwingen, maar is toch succesvol beeindigd." -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" "Kan niet succesvol worden beeindigd. TAR werd afgebroken als gevolg van " "fouten." -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "Kan backendproces niet afbreken: %s" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "Ingesloten" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "Ongewijzigd" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "Map" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "Regel moet een string zijn" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "Dumpdir niet consistent : 'filename' is leeg" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "Dumpdir niet consistent : 'control' is leeg" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "Bestand '%s' bestaat niet." -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "Koptekst van het snarbestand is incompleet." -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "Een SnapshotFile is vereist" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "Map bestaat niet: %s." @@ -278,12 +286,17 @@ "\n" "Please check your configuration file." msgstr "" +"Foutmelding tijdens het uitvoeren van de configuratie:\n" +"%(error)s in regel `%(line)s`.\n" +"Controleer uw configuratiebestand." #: src/sbackup/core/ConfigManager.py:588 src/sbackup/core/ConfigManager.py:622 #, python-format msgid "" "Unable to evaluate '%(parameter)s' as a dictionary (value got = '%(value)r')." msgstr "" +"Kan '%(parameter)s' niet als dictionary gebruiken (ingevoerde waarde = " +"'%(value)r')." #: src/sbackup/core/ConfigManager.py:614 #, python-format @@ -294,27 +307,27 @@ #: src/sbackup/core/ConfigManager.py:638 msgid "You must provide a dictionary." -msgstr "" +msgstr "U dient een dictionary in te voeren." #: src/sbackup/core/ConfigManager.py:755 #, python-format msgid "Log output for [%(profile)s] is directed to file '%(file)s'." -msgstr "" +msgstr "Loguitvoer [%(profile)s] wordt opgeslagen in het bestand '%(file)s'." #: src/sbackup/core/ConfigManager.py:762 #, python-format msgid "Log output for [%s] is not directed into a file." -msgstr "" +msgstr "Loguitvoer voor [%s] wordt niet opgeslagen in een bestand." #: src/sbackup/core/ConfigManager.py:781 #, python-format msgid "Unable to rename log file '%(src)s'->'%(dst)s': %(err)s" -msgstr "" +msgstr "Hernoemen van logbestand mislukt '%(src)s'->'%(dst)s': %(err)s" #: src/sbackup/core/ConfigManager.py:801 #, python-format msgid "The config file '%s' couldn't be read!" -msgstr "" +msgstr "Lezen van configuratiebestand '%s' mislukt!" #: src/sbackup/core/ConfigManager.py:813 #, python-format @@ -326,6 +339,8 @@ #: src/sbackup/core/ConfigManager.py:895 msgid "No schedule defined in configuration file. Probing from filesystem." msgstr "" +"Geen schema ingesteld in het configuratiebestand. Uitvoeren vanuit het " +"bestandssysteem." #: src/sbackup/core/ConfigManager.py:988 #: src/sbackup/core/ConfigManager.py:1000 @@ -334,19 +349,19 @@ #: src/sbackup/core/ConfigManager.py:1163 msgid "No receiver set." -msgstr "" +msgstr "Geen ontvanger ingesteld." #: src/sbackup/core/ConfigManager.py:1165 msgid "No SMTP server set." -msgstr "" +msgstr "Geen SMTP-server ingesteld." #: src/sbackup/core/ConfigManager.py:1168 msgid "Username set but no password specified." -msgstr "" +msgstr "Wel gebruikersnaam, maar geen wachtwoord ingevoerd." #: src/sbackup/core/ConfigManager.py:1171 msgid "Password set but no username specified." -msgstr "" +msgstr "Wel wachtwoord, maar geen gebruikersnaam ingevoerd." #: src/sbackup/core/ConfigManager.py:1174 msgid "" @@ -354,72 +369,77 @@ "set.\n" "Select SSL in order to use Certificate and Key." msgstr "" +"Een certificaat en sleutelbestand ingevoerd, terwijl de SSL-optie niet is " +"ingesteld.\n" +"Selecteer SSL om gebruik te kunnen maken van het certificaat en de sleutel." #: src/sbackup/core/ConfigManager.py:1178 msgid "" "When specifying a SSL certificate or key file, a key file resp. certificate " "is mandatory." msgstr "" +"Wanneer een SSL-certificaat of sleutelbestand is ingesteld, is " +"respectievelijk een sleutelbestand of certificaat verplicht." -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Standaardprofiel" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Onbekend profiel" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "Onbeperkt" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" -msgstr "" +msgstr "100 MB" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" -msgstr "" +msgstr "250 MB" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" -msgstr "" +msgstr "650 MB" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" -msgstr "" +msgstr "2 GB (FAT16)" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" -msgstr "" +msgstr "4 GB (FAT32)" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Aangepast" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3-muziek" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI-video" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG-video" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matrjoshka-video" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "OGG-multimediacontainer" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "CD-imagebestanden" @@ -434,333 +454,266 @@ "File '%(filename)s' not found in snapshot's [%(snapshotname)s] files list, " "Skipped." msgstr "" +"Bestand '%(filename)s' niet gevonden in de lijst van [%(snapshotname)s] " +"snapshots; overgeslagen." -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "Snapshot '%s' niet gevonden " -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." -msgstr "" +msgstr "Ongeldig snapshotbestandsnaam `%(name)s` : Snapshotnaam ongeldig." -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "Een volledig snapshot '%s' hoeft niet op een ander geënt te worden" +msgstr "Ongeldig snapshotbestandsnaam `%(name)s` : %(error_cause)s." -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" -"'%(snapshotToRebase)s' heeft geen 'base' bestand , wellicht is het niet in " -"orde " - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" -"Kan een snapshot niet op een eerdere versie enten: '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "Snapshot '%(current)s' wordt op '%(base)s' geënt" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "De header van het SNAR-bestand is incompleet" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" +"Snapshot '%s' reeds ingesteld op \"volledig\", (geen wijzigingen " +"aangebracht!)." -#: src/sbackup/core/SnapshotManager.py:824 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "Afzien van het ophalen van snapshot '%s'" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "Bezig met upgraden van v1.0 naar v1.2: %s" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "Upgraden naar v1.3: %s" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "Upgraden naar v1.4: %s" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "Upgraden naar v1.5: %s" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" -msgstr "" - -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" +msgstr "Backupproces voorbereiden" -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." -msgstr "" +msgstr "Snapshot '%(name)s' wordt aangemaakt." -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." -msgstr "" +msgstr "Bezig met instellen van pakketbestanden." -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " -msgstr "" +msgstr "Probleem tijdens het instellen van de pakketlijst: " -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." -msgstr "" +msgstr "Bezig met instellen van Excludes-bestand" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" -msgstr "" +msgstr "Bezig met instellen van compressieformaat op '%s'" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" -msgstr "" +msgstr "Bezig met instellen van de grootte van de archiefdelen op %s" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." -msgstr "" +msgstr "Optie 'Follow symbolic links' is ingeschakeld." -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." -msgstr "" +msgstr "Optie 'Follow symbolic links' is uitgeschakeld." -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" -msgstr "" +msgstr "Snapshot wordt uitgevoerd" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" -msgstr "" +msgstr "Fout tijdens het verwijderen van oude snapshots: %s" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." -msgstr "" +msgstr "Backupproces afgerond." -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" -msgstr "" +msgstr "Bestandssysteem controleren en bestandsinfo vergaren." -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" -msgstr "" +msgstr "Inhoudsopgave van backup" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." -msgstr "" +msgstr "Aantal mappen: %s." -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." -msgstr "" +msgstr "Totaal aantal bestanden: %s." -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." -msgstr "" +msgstr "Aantal symlinks: %s." -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." -msgstr "" +msgstr "Aantal bestanden in snapshot: %s." -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." -msgstr "" +msgstr "Aantal nieuwe bestanden (ook inbegrepen): %s." -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." -msgstr "" +msgstr "Aantal overgeslagen bestanden in incremental snapshot: %s." -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." -msgstr "" +msgstr "Aantal bestanden waarvan uitsluitng is afgedwongen: %s." -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." -msgstr "" +msgstr "Aantal door configuratie uitgesloten bestanden: %s." -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." -msgstr "" +msgstr "Maximaal vereiste vrije ruimte is '%s'" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." -msgstr "" +msgstr "Beschikbare schijfruimte is '%s'." -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" +"Onvoldoende vrije ruimte in de doelmap voor de geplande backup (vrij: " +"%(freespace)s, vereist: %(neededspace)s)." -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "Geen snapshot om logbestand naar te kopieren." -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." -msgstr "" +msgstr "Kan doelmap niet vinden" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "Naam van snapshot '%s' voldoet niet aan vereiste" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "Ongeldige naam van snapshot : %s" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "Ongeldige naam voor base : %s" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -772,18 +725,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -795,65 +748,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -950,8 +907,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1250,126 +1206,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1378,77 +1328,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1477,7 +1427,7 @@ msgid "Restore..." msgstr "Herstellen..." -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "herstellen als ..." @@ -1485,12 +1435,12 @@ msgid "Revert..." msgstr "Terugzetten ..." -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "Terugzetten als ..." #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1566,11 +1516,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1596,58 +1546,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "De versie van het snapshot is hoger dan wordt ondersteund!" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "Upgrade van snapshot is mislukt" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "Wert je zeker dat je '%(current)s' op '%(base)s' wil enten?" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1656,22 +1554,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1680,35 +1578,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "Herstel van geselecteerde bestanden" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "Herstel van '%s' is nu bezig." -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1716,7 +1614,7 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1725,14 +1623,14 @@ "Herstel van '%(source)s'\n" "naar '%(dirname)s' is nu bezig." -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1741,21 +1639,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "Bezig met terugzetten van geselecteerde bestanden" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "Terugzetten van '%s' is nu bezig\n" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1763,21 +1661,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1808,67 +1706,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2113,7 +2006,7 @@ #: data/ui/sbackup-config.glade:1718 msgid "Include" -msgstr "Insluiten" +msgstr "Opnemen" #: data/ui/sbackup-config.glade:1739 msgid "Excluded files and directories" @@ -2403,6 +2296,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Bestanden/mappen herstellen" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Bronmap herstellen" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Beschikbare backups:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Aangepast gebruiken:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Standaard gebruiken:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Te herstellen bestanden en mappen" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Herstellen" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Herstellen Als..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2455,259 +2397,137 @@ msgid "Delete" msgstr "Verwijder" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "Upgraden" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "Snapshot Geschiedenis" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "Selecteer een snapshot in de lijst om op te enten." -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "Snapshot Beheer" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Herstellen" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "Terugdraaien" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "Export Beheer" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "Koptekst" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "Inhoud" -#~ msgid "Invalid value of the target directory : " -#~ msgstr "Ongeldige aanduiding van de doelmap: " - -#~ msgid "" -#~ "Got a non valid snapshot '%(name)s' due to name convention : %(error_cause)s " -#~ msgstr "" -#~ "Snapshot '%(name)s' is ongeldig vanwege naamgevingsregels: %(error_cause)s " - -#~ msgid "'%d' test(s) didn't succeed !" -#~ msgstr "'%d' test(s) mislukt !" - -#~ msgid "Test Succeeded !" -#~ msgstr "Test geslaagd!" - -#~ msgid "Target directory is writable." -#~ msgstr "Doelmap is beschijfbaar." - -#~ msgid "" -#~ "Please change target directory and test writability of the target directory " -#~ "by pressing \"Test\" button on the right." -#~ msgstr "" -#~ "Verander de doelmap en test of het systeem naar de doelmap kan schrijven " -#~ "door op de rechterkant de \"Test\"-knop in te drukken." - -#~ msgid "" -#~ "Choose the compression format that you want to apply.\n" -#~ "Default is gzip." -#~ msgstr "" -#~ "Kies het compressie formaat dat je wilt toepassen.\n" -#~ "Default is gzip." - -#~ msgid "" -#~ "Select the directory in which you have your backups.\n" -#~ "You can use a local or distant directory depending on the " -#~ "plugins you have installed." -#~ msgstr "" -#~ "Selecteer de map met je backups\n" -#~ "Je kunt een locale map of een map op afstand gebruiken, afhankelijk van de " -#~ "plugins die je hebt geinstalleerd." - -#~ msgid "Use the default directory : " -#~ msgstr "Gebruik de default map: " - -#~ msgid "Use a custom directory : " -#~ msgstr "gebruik een zelfgekozen map: " - -#~ msgid "Snapshots directory" -#~ msgstr "Map met snapshots" - -#~ msgid "Restore As" -#~ msgstr "Herstellen als" - -#~ msgid "Revert As" -#~ msgstr "Terugzetten als" - -#~ msgid "Select a snapshot and change its base to another snapshot." -#~ msgstr "Selecteer een snapshot ent het op een andere snapshot." - -#~ msgid "I didn't find the log file. Please set it up in nssbackup.conf " -#~ msgstr "" -#~ "Het logbestand werd niet gevonden. U kan het instellen in nssbackup.conf " - -#~ msgid "Initializing FUSE FILE ACCESS MANAGER !" -#~ msgstr "Bezig met initialiseren van de FUSE FILE ACCESS MANAGER !" - -#~ msgid "Problem with '%(file)s' : %(error)s " -#~ msgstr "Probleem met '%(file)s' : %(error)s " - -#~ msgid "No directory to backup !" -#~ msgstr "Geen map gevonden om te backuppen!" +#, python-format +#~ msgid "No need to rebase a full snapshot '%s'" +#~ msgstr "Een volledig snapshot '%s' hoeft niet op een ander geënt te worden" +#, python-format #~ msgid "" -#~ "'%(file)s' size is higher than the specified one ( %(filesize)s > " -#~ "%(maxsize)s), it has to be exclude " +#~ "'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " #~ msgstr "" -#~ "Bestandsgrootte van '%(file)s' is groter dan de opgegeven grootte ( " -#~ "%(filesize)s > %(maxsize)s), bestand wordt niet opgenomen " +#~ "'%(snapshotToRebase)s' heeft geen 'base' bestand , wellicht is het niet in " +#~ "orde " +#, python-format #~ msgid "" -#~ "When setting a username (resp password), password (resp username) is " -#~ "mandatory" +#~ "Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " +#~ "'%(NewBaseSnapshot)s' " #~ msgstr "" -#~ "Wanneer een gebruikersnaam (respectievelijk wachtwoord) wordt ingesteld, is " -#~ "een wachtwoord (respectievelijk gebruikersnaam) verplicht." - -#~ msgid "Set the reciever of this mail" -#~ msgstr "Stel de ontvanger van deze e-mail in" - -#~ msgid "Starting snapshot %(name)s " -#~ msgstr "Start snapshot %(name)s " - -#~ msgid "Empty regular expression found. " -#~ msgstr "Lege regular expression gevonden " - -#~ msgid "Unable to change permissions for " -#~ msgstr "Permissies veranderen is mislukt voor " - -#~ msgid "Target '%s' directory is excluded" -#~ msgstr "Doelmap '%s' is uitgesloten" - -#~ msgid "Invalid regular expression ('%s')" -#~ msgstr "Ongeldige regular expression ('%s')" - -#~ msgid "Choose the SSL option (smtptls=1) to be able to use Cert and Key" -#~ msgstr "Kies de SSL optie (smtptls=1) om Cert and Key te gebruiken" +#~ "Kan een snapshot niet op een eerdere versie enten: '%(snapshotToRebase)s' <= " +#~ "'%(NewBaseSnapshot)s' " -#~ msgid "Snapshot '%s' is already Full, nothing to do (not changing it to full" -#~ msgstr "" -#~ "Snapshot '%s' is reeds een volledige backup. Niet nodig om volledig te maken." - -#~ msgid "NSsbackup configuration error" -#~ msgstr "Configuratiefout NSsbackup" - -#~ msgid "Save to file ..." -#~ msgstr "Opslaan naar bestand ..." - -#~ msgid "This is a user friendly backup solution for common desktop needs." -#~ msgstr "" -#~ "Dit is een gebruikersvriendelijke backupoplossing die tegemoetkomt aan de " -#~ "noden van de gemiddelde gebruiker." - -#~ msgid "'%(file)s' doesn't exist, it has to be exclude " -#~ msgstr "'%(file)s' bestaat niet, bestand wordt niet opgenomen " - -#~ msgid "" -#~ "We don't have read access to '%(file)s', it has to be exclude : %(error)s " -#~ msgstr "" -#~ "Kan geen leestoegang krijgen tot '%(file)s', bestand wordt niet opgenomen : " -#~ "%(error)s " +#, python-format +#~ msgid "Rebasing '%(current)s' on '%(base)s'" +#~ msgstr "Snapshot '%(current)s' wordt op '%(base)s' geënt" -#~ msgid "Terminating FUSE FILE ACCESS MANAGER !" -#~ msgstr "Bezig met afsluiten FUSE FILE ACCESS MANAGER !" +#, python-format +#~ msgid "Cancelling pull of snapshot '%s'" +#~ msgstr "Afzien van het ophalen van snapshot '%s'" -#~ msgid "Got an exception when Pulling '%s' : " -#~ msgstr "Foutmelding bij verkrijgen '%s': " +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "Bezig met upgraden van v1.0 naar v1.2: %s" -#~ msgid "Snapshot '%s' is a full . Can't rebase on older snapshot" -#~ msgstr "" -#~ "Snapshot '%s' is een volledige backup. Niet mogelijk om op een ouder " -#~ "snapshot te enten." +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "Upgraden naar v1.3: %s" -#~ msgid "NSsbackup restoration error" -#~ msgstr "NSsbackup herstel-fout" +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "Upgraden naar v1.4: %s" -#~ msgid "Couldn't make a proper backup : " -#~ msgstr "Kon geen goeie backup maken: " +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "Upgraden naar v1.5: %s" -#~ msgid "Non existing directory : %s" -#~ msgstr "Niet bestaande map : %s" +#~ msgid "The version of the snapshot is greater than the supported one!" +#~ msgstr "De versie van het snapshot is hoger dan wordt ondersteund!" -#~ msgid "gtk-remove" -#~ msgstr "gtk-verwijderen" +#~ msgid "Unable to upgrade snapshot" +#~ msgstr "Upgrade van snapshot is mislukt" -#~ msgid "gtk-add" -#~ msgstr "gtk-toevoegen" +#, python-format +#~ msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" +#~ msgstr "Wert je zeker dat je '%(current)s' op '%(base)s' wil enten?" -#~ msgid "gtk-close" -#~ msgstr "gtk-sluiten" +#~ msgid "Upgrade" +#~ msgstr "Upgraden" -#~ msgid "gtk-edit" -#~ msgstr "gtk-bewerken" +#, python-format +#~ msgid "An error occurred when pulling snapshot '%s'." +#~ msgstr "Foutmelding tijdens het werken met snapshot '%s'." #~ msgid "" -#~ "Please enter the new profile name in the Profile name entry and check " -#~ "the Enable checkbox to enable it." +#~ "There are snapshots stored in outdated snapshot formats. Please upgrade them " +#~ "using 'Simple Backup-Restoration' if you want to use them." #~ msgstr "" -#~ "Voer de naam van het nieuwe profiel in in het Profile name vakje en " -#~ "vink Enable aan om te in te schakelen." - -#~ msgid "Test all" -#~ msgstr "Alles testen" +#~ "Er zijn snapshots opgeslagen in een verouderde snapshotformaat. Deze dient u " +#~ "bij te werken met 'Simple Backup-Restoration' om er gebruik van te kunnen " +#~ "maken." -#~ msgid "Time (for admins only)" -#~ msgstr "Tijd (alleen voor admins)" - -#~ msgid "" -#~ "Debug is just for debbuging purpose\n" -#~ "Info is the recommended setting" +#, python-format +#~ msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." #~ msgstr "" -#~ "Debug is alleen voor het debuggen. \n" -#~ "Info is de aanbevolen instelling" - -#~ msgid "Log settings" -#~ msgstr "Log instellingen" +#~ "SNAR-bestand bestaat reeds voor snapshot '%s'. Deze wordt niet overschreven." -#~ msgid "Security" -#~ msgstr "Beveiliging" +#, python-format +#~ msgid "Unable to remove upgrade stamp: %s" +#~ msgstr "Kan upgrade stamp %s niet verwijderen" -#~ msgid "Parameters" -#~ msgstr "Parameters" +#, python-format +#~ msgid "Base of snapshot '%s' is not set." +#~ msgstr "Base van snapshot '%s' is niet ingesteld." diff -Nru sbackup-0.11.4/po/oc.po sbackup-0.11.6/po/oc.po --- sbackup-0.11.4/po/oc.po 2011-02-13 18:22:15.000000000 +0100 +++ sbackup-0.11.6/po/oc.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-19 02:41+0000\n" "Last-Translator: Cédric VALMARY (Tot en òc) \n" "Language-Team: Occitan (post 1500) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "Cap de fichièr jornal pas indicat." @@ -42,53 +42,53 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "Salvament anullat per l'utilizaire." -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "I a agut una error pendent la còpia de seguretat :" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "Las érrors seguentas se son produchas abans :" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "Manteneires :" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "Contributors :" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -104,131 +104,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "Inclús" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "Pas cambiat" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "Dorsièr" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "Un SnapshotFile es requesit" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -338,65 +338,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Perfil per defaut" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Perfil desconegut" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "Illimitat" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "100 Mio" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "250 Mio" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "650 Mio" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "2 Gio (FAT16)" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "4 Gio (FAT32)" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Personalizar" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Musica MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "Vidèo AVI" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "Vidèo MPEG" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Vidèo Matroska" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Imatges de CD" @@ -412,328 +412,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "Mesa a jorn de v1.0 a v1.2 : %s" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "Mesa a jor a v1.3 : %s" - -#: src/sbackup/core/UpgradeManager.py:229 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.4: %s" -msgstr "Mesa a jorn a v1.4 : %s" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "Mesa a jorn a v1.5 : %s" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "Nom del parent invalid : %s" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -745,18 +676,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -768,65 +699,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -916,8 +851,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1212,126 +1146,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1340,77 +1268,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1439,7 +1367,7 @@ msgid "Restore..." msgstr "Restablir..." -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "Restabliment en tant que ..." @@ -1447,12 +1375,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1528,11 +1456,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1558,58 +1486,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1618,22 +1494,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1642,35 +1518,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "Restabliment de '%s' en cors" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1678,21 +1554,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1701,21 +1577,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "Retrogradacion de '%s' en cors.\n" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1723,21 +1599,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1768,67 +1644,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2364,6 +2235,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Restablir" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2416,83 +2336,75 @@ msgid "Delete" msgstr "Suprimir" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "Metre a jorn" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Restablir" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "Restablir" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "Gestion de l'exportacion" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "Entèsta" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "Contengut" -#~ msgid "Test Succeeded !" -#~ msgstr "Tèst capitat" +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "Mesa a jorn de v1.0 a v1.2 : %s" -#~ msgid "remove" -#~ msgstr "suprimir" +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "Mesa a jor a v1.3 : %s" -#~ msgid "disable" -#~ msgstr "desactivar" +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "Mesa a jorn a v1.4 : %s" -#~ msgid "Actual base : %s" -#~ msgstr "Parent actual : %s" +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "Mesa a jorn a v1.5 : %s" -#~ msgid "No directory to backup !" -#~ msgstr "Pas cap de repertòri de salvar !" +#~ msgid "Upgrade" +#~ msgstr "Metre a jorn" diff -Nru sbackup-0.11.4/po/pl.po sbackup-0.11.6/po/pl.po --- sbackup-0.11.4/po/pl.po 2011-02-13 18:22:14.000000000 +0100 +++ sbackup-0.11.6/po/pl.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" -"PO-Revision-Date: 2010-10-05 13:43+0000\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" +"PO-Revision-Date: 2011-02-06 11:39+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "Demon programu SBackup <%(login)s@%(hostname)s>" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "Nie określono pliku dziennika." @@ -45,27 +45,27 @@ "\n" "Przetwarzanie pozostałych profili będzie kontynuowane." -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "Tworzenie kopii zapasowej zostało anulowane przez użytkownika." -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "Wystąpił błąd podczas anulowania wykonywania kopii zapasowej:" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "Wystąpił błąd podczas wykonywania kopii zapasowej:" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "Wystąpił błąd podczas wysyłania poczty elektronicznej:" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "Poniższy błąd (błędy) wystąpił wcześniej:" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" @@ -74,7 +74,7 @@ "Wykonywanie kopii zapasowej nie zostało rozpoczęte.\n" "%s" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " @@ -83,26 +83,28 @@ "Umożliwia w prosty sposób tworzenie kopii zapasowych. Informacje na temat " "pomocy przy rozwoju programu dostępne są w witrynie internetowej." -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "Opiekunowie:" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "Byli opiekunowie:" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "Współtwórcy:" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Rafał Ryba \n" "\n" "Launchpad Contributions:\n" +" Jarek Witkowski https://launchpad.net/~jarek-witkowski\n" " Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" -" Piotr Sokół https://launchpad.net/~psokol" +" Piotr Sokół https://launchpad.net/~psokol\n" +" fafek2 https://launchpad.net/~fafek2" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -114,57 +116,57 @@ msgid "Effective path for `%s` is not available" msgstr "Brak efektywnej ścieżki dla „%s”" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "Nie można pozyskać efektywnej ścieżki dla „%s”" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "Na razie dzielenie skompresowanego archiwum nie jest możliwe." -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "Nie można zmienić uprawnień dla pliku '%s'." -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "Nie można usunąć pliku tymczasowego „%(file)s”: %(error)s" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "Uruchamianie programu TAR w celu wykonania kopii przyrostowej." -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "Nie można odnaleźć pliku SNAR w celu wykonania kopii przyrostowej." -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "Powracanie do kompletnej kopii zapasowej." -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "Uruchamianie programu TAR w celu wykonania kompletnej kopii." -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "Program TAR zwrócił informację: %s" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" @@ -173,18 +175,18 @@ "Program TAR zwrócił informacje:\n" "%s" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "Program TAR został poprawnie zakończony." -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" "Program TAR zwrócił ostrzeżenie:\n" "%s" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" @@ -193,58 +195,58 @@ "Program TAR zwrócił ostrzeżenia:\n" "%s" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "Program TAR zwrócił ostrzeżenia ale został poprawnie zakończony." -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "Program TAR został zakończony z błędami." -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "Nie można zakończyć procesu modułu obsługi: %s" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "Dołączone" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "Niezmieniony" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "Katalog" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "Wiersz musi być ciągiem" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "Plik „%s” nie istnieje." -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "Nagłówek pliku snar jest niekompletny." -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "Katalog nie istnieje: %s" @@ -360,65 +362,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Domyślny profil" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Nieznany profil" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "Brak ograniczeń" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "100 MiB" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "250 MiB" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "650 MiB" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "2 GiB (FAT16)" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "4 GiB (FAT32)" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Własne" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Nagrania dźwięku w formacie MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "Nagrania wideo w formacie AVI" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "Nagrania wideo w formacie MPEG" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Nagrania wideo w formacie Matroska" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "Kontenery multimediów OGG" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Obrazy płyt CD" @@ -436,229 +438,153 @@ "Nie odnaleziono pliku „%(filename)s” na liście zrzutu danych " "„%(snapshotname)s”. Pominięto." -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "Nie odnaleziono zrzutu danych „%s” " -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "Wykryto niepoprawny zrzut danych „%(name)s”: niepoprawna nazwa." -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "Odnaleziono niepoprawny zrzut danych „%(name)s”: %(error_cause)s." -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "Nie ma potrzeby zmieniać bazę kompletnego zrzutu danych „%s”" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" -"Zrzut danych „%(snapshotToRebase)s” nie posiada pliku bazowego lub został on " -"uszkodzony. " - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" -"Nie można zmienić bazy zrzutu danych na wcześniejszą: „%(snapshotToRebase)s” " -"<= „%(NewBaseSnapshot)s”. " - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "Zmienianie bazy z „%(current)s” na „%(base)s”" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "Nagłówek pliku SNAR jest niekompletny!" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "Nie ustawiono bazy zrzutu danych „%s”." - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "Zrzut danych „%s” jest już kompletny. Brak czynności do wykonania." -#: src/sbackup/core/SnapshotManager.py:824 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Cancelling pull of snapshot '%s'" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "Nie można usunąć oznaczenia aktualizacji: %s" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "Aktualizowanie z wersji 1.0 do wersji 1.2: %s" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "Aktualizowanie do wersji 1.3: %s" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "Aktualizowanie do wersji 1.4: %s" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "Aktualizowanie do wersji 1.5: %s" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "Plik SNAR zrzutu danych „%s” już istnieje. Nie zostanie zastąpiony." - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "Przygotowywanie do wykonania kopii zapasowej" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" -"Napotkano zrzuty danych przechowywane w nieaktualnych formatach. Proszę " -"zaktualizować je używając „Prostego przywracania kopii zapasowych”, aby móc " -"ich użyć." - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "Wykonywanie zrzutu danych „%(name)s”." -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "Określanie wykluczonych położeń" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "Ustawianie formatu kompresji na „%s”" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "Ustawianie rozmiaru fragmentów archiwum na %s" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "Opcja „Podążanie za dowiązaniami symbolicznymi” jest włączona." -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "Opcja „Podążanie za dowiązaniami symbolicznymi” jest wyłączona." -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "Wystąpił błąd podczas usuwania przestarzałych zrzutów danych: %s" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "Zakończono wykonywanie kopii zapasowej." -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "Analizowanie systemu plików i zbieranie informacji o plikach" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "Podsumowanie kopii zapasowej" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "Ilość katalogów: %s." -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "Ogólna ilość plików: %s." -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "Ilość dowiązań symbolicznych: %s." -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "Ilość plików uwzględnionych w zrzucie danych: %s." -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "Ilość uwzględnionych nowych plików: %s." -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" "Ilość plików pominiętych podczas wykonywania przyrostowego zrzutu danych: %s." -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "Ilość elementów wykluczonych przymusowo: %s." -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "Ilość elementów wykluczonych na podstawie ustawień: %s." -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "Maksymalna wymagana ilość wolnej przestrzeni wynosi %s." -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "Dostępna ilość przestrzeni dyskowej wynosi %s." -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " @@ -667,109 +593,109 @@ "Brak wystarczającej ilości wolnej przestrzeni w położeniu docelowym dla " "planowanej kopii zapasowej (wolna: %(freespace)s, wymagana %(neededspace)s)." -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" "Nie można skopiować pliku dziennika. Dostęp do pliku nie został zainicjowany." -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "Nie można skopiować pliku dziennika: %s" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" "Nie można odnaleźć pliku dziennika w celu skopiowania go do zrzutu danych." -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "Przetwarzanie profilu zostało anulowane na życzenie użytkownika.\n" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "Przetwarzanie profilu zostało zakończone pomyślnie.\n" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "Przetwarzanie profilu zostało zakończone z błędem: %s\n" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "Położenie docelowe kopii zapasowej: %s" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "Nie można odnaleźć położenia docelowego." -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "Nie można odnaleźć położenia docelowego po ponownej próbie." -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "Położenie docelowe „%(target)s” nie istnieje." -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "Nie można uzyskać dostępu do położenia docelowego: %s" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "Nazwa zrzutu danych „%s” nie pasuje do wymaganej." -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "Niepoprawna nazwa zrzutu danych: %s" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "Niepoprawna nazwa bazy: %s" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "Niepoprawna nazwa zrzutu danych: %s" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "Należy określić nazwę bazy dla przyrostowej kopii zapasowej." @@ -781,18 +707,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "Kończenie działania menedżera dostępu plików FUSE" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "SFTP" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "SSH" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "FTP" @@ -804,67 +730,71 @@ msgid "Terminating GIO File Access Manager." msgstr "Kończenie działania menedżera dostępu GIO" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "NFS" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "SMB" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "Położenie jest już zamontowane." -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "Położenie nie jest zamontowane." -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" -msgstr "" +msgstr "Utwórz plik" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" -msgstr "" +msgstr "Usuń plik" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" -msgstr "" +msgstr "Usuń katalog" #: src/sbackup/fuse_plugins/__init__.py:160 #, python-format @@ -981,8 +911,7 @@ "\n" "%s." -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "Błąd narzędzia prostego tworzenia kopii zapasowej" @@ -1333,126 +1262,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "wystąpiły problemy podczas inicjacji modułu pynotify" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "Nie udało się połączyć z demonem powiadamiania: %s" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "Proste tworzenie kopii zapasowej" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "Anuluj" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "Połączenie z usługą D-Bus zostało przerwane." -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "Połączono ponownie" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "Rozpoczynanie sesji kopii zapasowej" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "Kończenie sesji kopii zapasowej" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "Odebrano nieznane zdarzenie usługi D-Bus „%s”." -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "Spróbuj ponownie" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "Nie można wyświetlić okna: %s" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "Anulować wykonywanie kopii zapasowej profilu „%s”?" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "Anulować wykonywanie kopii zapasowej?" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "Nie można anulować wykonywania kopii zapasowej." -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "Profil: %s" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "Rozmiar kopii: %s" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "Ukończono %.1f%%" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "Pozostały czas: %s" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "Identyfikator procesu anulowanej kopii zapasowej: %s" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "Nie można wysłać sygnału do procesu %s" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "Wysyłanie sygnału do procesu %s, przy użyciu programu gksu" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "Nie udało się wysłać sygnał do procesu %s, przy użyciu programu gksu" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1465,77 +1388,77 @@ "Nie można odnaleźć położenia docelowego „%s”.\n" "\n" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "nieznany" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "mniej niż 1 minuta" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "około 2 minuty" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "około 3 minuty" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "około 4 minut" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "około 5 minut" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "około %.0f minut" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "W trakcie" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "zakończono" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "Postęp: nieznany" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "Przygotowywanie kopii zapasowej" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "Gromadzenie informacji o plikach" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "Postęp: anulowano" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "Wystąpił błąd" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "Nie udało się zainicjować GTK+: %s" @@ -1571,7 +1494,7 @@ msgid "Restore..." msgstr "Przywróć..." -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "Przywróc jako..." @@ -1579,12 +1502,12 @@ msgid "Revert..." msgstr "Przywróć rekurencynie..." -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "Przywróć rekurencyjnie jako..." #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "n/d" @@ -1660,15 +1583,12 @@ msgid "No backups found for this day." msgstr "Nie odnaleziono kopii zapasowych wykonanych we wskazanym dniu." -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" -"Wersja zrzutu danych nie jest obsługiwana (wersja obsługiwana: " -"%(supportedversion)s). Wersja zrzutu danych: %(currentversion)s. Proszę " -"zaktualizować zrzut danych. " #: src/sbackup/ui/restoregui.py:643 msgid "Select restore location" @@ -1693,60 +1613,6 @@ msgstr "Odczytywanie zrzutu danych..." #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "Zaktualizować zrzut danych?" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "Zaktualizowano zrzut danych." - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "Zakończono aktualizowanie" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" -"Wystąpił następujący błąd podczas próby zaktualizowania zrzutu danych:\n" -"%s" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "Nie można zaktualizować zrzutu danych" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1759,11 +1625,11 @@ "\n" "Usunąć zrzut danych?" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "Usuwanie zrzutu danych" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" @@ -1772,11 +1638,11 @@ "Wystąpił błąd podczas próby usunięcia zrzutu danych:\n" "%s" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "Nie można usunąć zrzutu danych" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1785,35 +1651,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "Nie można usunąć zrzutu danych" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "Kończenie działania" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "Proste przywracanie kopii zapasowej" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "Przywracanie wskazanych plików" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "Przywracanie '%s' trwa." -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "Przywrócono „%s”." -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1824,7 +1690,7 @@ "\n" "Wystąpił następujący błąd:\n" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1833,7 +1699,7 @@ "Przywracanie'%(source)s'\n" "do '%(dirname)s' trwa." -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1842,7 +1708,7 @@ "Przywrócono „%(source)s”\n" "do położenia „%(dirname)s”." -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1855,21 +1721,21 @@ "\n" "Wystąpił następujący błąd:\n" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "Przywracanie rekurencyjne wskazanych plików" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "Trwa przywracanie rekurencyjne „%s”.\n" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "Przywrócono rekurencyjnie „%s”." -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1880,7 +1746,7 @@ "\n" "Wystąpił następujący błąd:\n" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1889,7 +1755,7 @@ "Trwa przywracanie rekurencyjne „%(source)s”\n" "do położenia „%(dirname)s”." -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1898,7 +1764,7 @@ "Przywrócono rekurencyjnie „%(source)s”\n" "do położenia „%(dirname)s”." -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1933,15 +1799,10 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "Plik „%(file)s” nie istnieje." - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "Nie można uzyskać dostępu do pliku „%(file)s”: %(error)s." -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." @@ -1949,60 +1810,61 @@ "Brak uprawnień do odczytania pliku „%(file)s”. Przekroczono limit czasu " "operacji." -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "Brak uprawnień do odczytania pliku „%(file)s”: %(error)s." -#: src/sbackup/util/filecollect.py:385 -#, python-format -msgid "File '%(file)s' is backup's target directory." -msgstr "Położenie „%(file)s” jest położeniem docelowym kopii zapasowej." - -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:372 #, python-format msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" "Dowiązanie symboliczne „%(path)s” do położenia „%(ln_target)s” jest " "rekurencyjne." -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "File '%(file)s' is backup's target directory." +msgstr "Położenie „%(file)s” jest położeniem docelowym kopii zapasowej." + +#: src/sbackup/util/filecollect.py:393 +#, python-format +msgid "Path '%(file)s' defined in excludes list." msgstr "" -"Plik „%(file)s” przekroczył dopuszczalny rozmiar (%(filesize)s > " -"%(maxsize)s)." +"Ścieżka „%(file)s” została wprowadzona na listę wykluczonych położeń." -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "Plik „%(file)s” pasuje do wyrażenia regularnego „%(regex)s”." -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -"Ścieżka „%(file)s” została wprowadzona na listę wykluczonych położeń." +"Plik „%(file)s” przekroczył dopuszczalny rozmiar (%(filesize)s > " +"%(maxsize)s)." -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "Wystąpił błąd podczas sprawdzania katalogu „%(dir)s”: %(error)s." -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "Napotkano puste wyrażenie regularne. Pomijanie." -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "Napotkano niepoprawne wyrażenie regularne („%s”). Pomijanie" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" +"Nie zdefiniowano katalogów dla których ma zostać utworzona kopia zapasowa" #: src/sbackup/util/lock.py:76 msgid "Another application instance is already running." @@ -2583,6 +2445,55 @@ msgid "Make a full backup" msgstr "Wykonanie kompletnej kopii" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Przywróc pliki lub katalogi" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Folder źródłowy przywracania" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Dostępne kopie zapasowe:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Użyj własnego:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Użyj domyślnego:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Pliki i foldery do przywrócenia" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Przywróć" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Przywróć jako..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "Położenie docelowe" @@ -2641,47 +2552,35 @@ msgid "Delete" msgstr "Usuń" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "Zaktualizowanie zrzutu danych" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "Zaktualizuj" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "Historia zrzutów danych" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "Bieżąca baza:" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "Zarządzanie" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "Szczegóły zrzutu danych" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "Przywraca pliki i katalogi ze wskazanego zrzutu danych" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Przywróć" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" @@ -2689,93 +2588,120 @@ "Przywraca pliki i katalogi rekurencyjnie rozpoczynając od bazowego zrzutu " "danych a kończąc na wskazanym zrzucie danych" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "Przywróć rekurencyjnie" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "Przywracanie" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "Eksportowanie" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "Nagłówek" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "Zawartość" -#~ msgid "Invalid value of the target directory : " -#~ msgstr "Nieprawidłowa wartość katalogu docelowego : " +#, python-format +#~ msgid "Unable to remove upgrade stamp: %s" +#~ msgstr "Nie można usunąć oznaczenia aktualizacji: %s" -#~ msgid "Test on '%s' didn't succeed!" -#~ msgstr "Test na '%s' nie powiódł się!" +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "Aktualizowanie z wersji 1.0 do wersji 1.2: %s" -#~ msgid "Test Succeeded !" -#~ msgstr "Test powiódł się !" +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "Aktualizowanie do wersji 1.3: %s" -#~ msgid "Target directory is writable." -#~ msgstr "Katalog docelowy jest zapisywalny." +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "Aktualizowanie do wersji 1.4: %s" -#~ msgid "" -#~ "Please change target directory and test writability of the target directory " -#~ "by pressing \"Test\" button on the right." -#~ msgstr "" -#~ "Proszę zmienić katalog docelowy i zrobić test zapisu wciskając przycisk " -#~ "\"Test\" po prawej stronie." +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "Aktualizowanie do wersji 1.5: %s" -#~ msgid "disable" -#~ msgstr "wyłącz" +#, python-format +#~ msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." +#~ msgstr "Plik SNAR zrzutu danych „%s” już istnieje. Nie zostanie zastąpiony." #~ msgid "" -#~ "Choose the compression format that you want to apply.\n" -#~ "Default is gzip." +#~ "There are snapshots stored in outdated snapshot formats. Please upgrade them " +#~ "using 'Simple Backup-Restoration' if you want to use them." #~ msgstr "" -#~ "Wybierz format kompresji, który chcesz zastosować.\n" -#~ "Domyślnym jest gzip." +#~ "Napotkano zrzuty danych przechowywane w nieaktualnych formatach. Proszę " +#~ "zaktualizować je używając „Prostego przywracania kopii zapasowych”, aby móc " +#~ "ich użyć." -#~ msgid "" -#~ "Select the directory in which you have your backups.\n" -#~ "You can use a local or distant directory depending on the " -#~ "plugins you have installed." -#~ msgstr "" -#~ "Wybierz katalog, w którym trzymasz kopie zapasowe.\n" -#~ "Możesz użyć lokalnego lub odległego katalogu w zależności od " -#~ "wtyczek, jakie zainstalowałeś." +#~ msgid "Unable to upgrade snapshot" +#~ msgstr "Nie można zaktualizować zrzutu danych" -#~ msgid "Use the default directory : " -#~ msgstr "Użyj domyślnego katalogu : " +#~ msgid "Do you really want to upgrade snapshot?" +#~ msgstr "Zaktualizować zrzut danych?" -#~ msgid "Use a custom directory : " -#~ msgstr "Użyj własnego katalogu : " +#~ msgid "Snapshot was sucessfully upgraded." +#~ msgstr "Zaktualizowano zrzut danych." -#~ msgid "Restore As" -#~ msgstr "Przywróć jako" +#, python-format +#~ msgid "File '%(file)s' does not exist." +#~ msgstr "Plik „%(file)s” nie istnieje." -#~ msgid "Revert As" -#~ msgstr "Cofnij jako" +#~ msgid "Upgrade snapshot" +#~ msgstr "Zaktualizowanie zrzutu danych" -#~ msgid "Target '%s' directory is excluded" -#~ msgstr "Docelowy katalog '%s' jest wykluczony" +#~ msgid "Upgrade" +#~ msgstr "Zaktualizuj" -#~ msgid "Save to file ..." -#~ msgstr "Zapisz do pliku ..." +#, python-format +#~ msgid "" +#~ "Snapshot version is not supported (Only %(supportedversion)s is supported). " +#~ "Version '%(currentversion)s' found. You should upgrade it. " +#~ msgstr "" +#~ "Wersja zrzutu danych nie jest obsługiwana (wersja obsługiwana: " +#~ "%(supportedversion)s). Wersja zrzutu danych: %(currentversion)s. Proszę " +#~ "zaktualizować zrzut danych. " -#~ msgid "Test all" -#~ msgstr "Testuj wszystkie" +#~ msgid "Upgrade finished" +#~ msgstr "Zakończono aktualizowanie" -#~ msgid "Time (for admins only)" -#~ msgstr "Czas (tylko dla administratorów)" +#, python-format +#~ msgid "" +#~ "'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " +#~ msgstr "" +#~ "Zrzut danych „%(snapshotToRebase)s” nie posiada pliku bazowego lub został on " +#~ "uszkodzony. " + +#, python-format +#~ msgid "" +#~ "Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " +#~ "'%(NewBaseSnapshot)s' " +#~ msgstr "" +#~ "Nie można zmienić bazy zrzutu danych na wcześniejszą: „%(snapshotToRebase)s” " +#~ "<= „%(NewBaseSnapshot)s”. " + +#, python-format +#~ msgid "Base of snapshot '%s' is not set." +#~ msgstr "Nie ustawiono bazy zrzutu danych „%s”." -#~ msgid "Problem with '%(file)s' : %(error)s " -#~ msgstr "Problem z '%(file)s' : %(error)s " +#, python-format +#~ msgid "" +#~ "While attempting to upgrade snapshot the following error occurred:\n" +#~ "%s" +#~ msgstr "" +#~ "Wystąpił następujący błąd podczas próby zaktualizowania zrzutu danych:\n" +#~ "%s" -#~ msgid "Non existing directory : %s" -#~ msgstr "Nieistniejący katalog : %s" +#, python-format +#~ msgid "No need to rebase a full snapshot '%s'" +#~ msgstr "Nie ma potrzeby zmieniać bazę kompletnego zrzutu danych „%s”" -#~ msgid "Set the reciever of this mail" -#~ msgstr "Ustaw odbiorcę tej poczty." +#, python-format +#~ msgid "Rebasing '%(current)s' on '%(base)s'" +#~ msgstr "Zmienianie bazy z „%(current)s” na „%(base)s”" diff -Nru sbackup-0.11.4/po/pt_BR.po sbackup-0.11.6/po/pt_BR.po --- sbackup-0.11.4/po/pt_BR.po 2011-02-13 18:22:15.000000000 +0100 +++ sbackup-0.11.6/po/pt_BR.po 2013-09-17 20:50:00.000000000 +0200 @@ -8,17 +8,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" -"PO-Revision-Date: 2010-10-05 13:24+0000\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" +"PO-Revision-Date: 2011-02-06 11:39+0000\n" "Last-Translator: Vítor Avelino \n" "Language-Team: Portuguese/Brazil \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -28,7 +28,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "Nenhum arquivo de log especificado" @@ -44,27 +44,27 @@ msgstr "" "Erro Crítico: Nenhum arquivo de configuração padrão encontrado no perfil." -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "Backup cancelado pelo usuário" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "Um erro ocorreu durante o cancelamento da cópia de segurança:" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "Um erro ocorreu durante o processo de cópia:" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "Erro ao enviar email:" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "O(s) seguinte(s) erro(s) ocorreu(ram) antes de:" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" @@ -73,7 +73,7 @@ "Backup não está sendo iniciado.\n" "%s" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " @@ -83,26 +83,28 @@ "estação de trabalho. Se você quer ajudar mandando bugs, traduzindo ou " "qualquer outra coisa por favor visite nossa página." -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "Mantenedores:" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "Colaboradores:" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Jonh Wendell \n" "\n" "Launchpad Contributions:\n" " Alexsandro Haag https://launchpad.net/~alexsandro-haag\n" +" Jonh Wendell https://launchpad.net/~wendell\n" " Kauan Mocelin https://launchpad.net/~kauanmocelin\n" +" Leonardo Gregianin https://launchpad.net/~leogregianin\n" " Vítor Avelino https://launchpad.net/~vitoravelino" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 @@ -115,132 +117,132 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "Impossível remover o arquivo temporário '%(file)s': %(error)s" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "Iniciando TAR para fazer backup incremental." -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" "Não foi possível encontrar o arquivo SNAR para fazer um backup incremental." -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -351,65 +353,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Perfil Padrão" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Perfil Desconhecido" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Personalizada" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Música MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "Vídeo AVI" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "Vídeo MPEG" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Vídeo Matrjoshka" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "Multimídia OGG" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Imagem de CD" @@ -426,328 +428,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "Snapshot '%s' não encontrado " -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Unable to remove upgrade stamp: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -759,18 +692,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -782,65 +715,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -930,8 +867,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1228,126 +1164,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1356,77 +1286,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1455,7 +1385,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1463,12 +1393,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1544,11 +1474,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1574,58 +1504,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1634,22 +1512,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1658,35 +1536,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1694,21 +1572,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1717,21 +1595,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1739,21 +1617,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1784,67 +1662,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2380,6 +2253,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Restaurar arquivos/pastas" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Pasta origem do backup" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Backups disponíveis:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Usar personalizado:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Usar padrão:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Arquivos e Pastas a restaurar" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Restaurar" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Restaurar Como..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2432,121 +2354,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Restaurar" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "Conteúdo" - -#~ msgid "Failed to set the gid to 'admin' one :" -#~ msgstr "Falha ao configurar o gid para 'admin':" - -#~ msgid "This is a user friendly backup solution for common desktop needs." -#~ msgstr "" -#~ "Isso é uma solução amigável de backup para as necessidades cotidianas de um " -#~ "desktop." - -#~ msgid "I didn't find the log file. Please set it up in sbackup.conf " -#~ msgstr "" -#~ "Eu não encontrei o arquivo de registro. Por favor, configure-o em " -#~ "sbackup.conf " - -#~ msgid "Target '%s' directory is excluded" -#~ msgstr "Diretório alvo '%s' está excluído" - -#~ msgid "Initializing FUSE FILE ACCESS MANAGER !" -#~ msgstr "Inicializando GERENCIADOR FUSE DE ACESSO À ARQUIVO!" - -#~ msgid "Setting Base to '%(value)s' " -#~ msgstr "Configurando Base para '%(value)s' " - -#~ msgid "No directory to backup !" -#~ msgstr "Sem diretório para realizar backup !" - -#~ msgid "Problem with '%(file)s' : %(error)s " -#~ msgstr "Problema com '%(file)s' : %(error)s " - -#~ msgid "Set the reciever of this mail" -#~ msgstr "Configurando o destinatário desse email" - -#~ msgid "Empty regular expression found. " -#~ msgstr "Encontrada expressão regular vazia. " - -#~ msgid "Invalid regular expression ('%s')" -#~ msgstr "Expressão regular inválida ('%s')" - -#~ msgid "" -#~ "'%(file)s' size is higher than the specified one ( %(filesize)s > " -#~ "%(maxsize)s), it has to be exclude " -#~ msgstr "" -#~ "'%(file)s' tamanho é maior do que o especificado ( %(filesize)s > " -#~ "%(maxsize)s), o arquivo tem que ser excluído " - -#~ msgid "" -#~ "We don't have read access to '%(file)s', it has to be exclude : %(error)s " -#~ msgstr "" -#~ "Nós não temos acesso de leitura para '%(file)s', o arquivo tem que ser " -#~ "excluído: %(error)s " - -#~ msgid "Starting snapshot %(name)s " -#~ msgstr "Inicializando captura de tela %(name)s " diff -Nru sbackup-0.11.4/po/pt.po sbackup-0.11.6/po/pt.po --- sbackup-0.11.4/po/pt.po 2011-02-13 18:22:17.000000000 +0100 +++ sbackup-0.11.6/po/pt.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:41+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,59 +42,63 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Equipa de Tradutores do Ubuntu PT , 2007.\n" "\n" "Launchpad Contributions:\n" -" Jean-Peer Lorenz https://launchpad.net/~peer.loz" +" Almufadado https://launchpad.net/~almufadado\n" +" Carlos Manuel https://launchpad.net/~crolidge\n" +" Fyda https://launchpad.net/~rvcortes\n" +" Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" +" Rui Pereira https://launchpad.net/~ruifpereira" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -106,131 +110,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -340,65 +344,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Personalizado" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Musíca MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "Vídeo AVI" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "Vídeo MPEG" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Vídeo Matrjoshka" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "Conteúdo Multimédia OGG" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Imagens de CD" @@ -414,328 +418,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.3: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -747,18 +682,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -770,65 +705,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -918,8 +857,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1217,126 +1155,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1345,77 +1277,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1444,7 +1376,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1452,12 +1384,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1533,11 +1465,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1563,58 +1495,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1623,22 +1503,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1647,35 +1527,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1683,21 +1563,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1706,21 +1586,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1728,21 +1608,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1773,67 +1653,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2370,6 +2245,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Restaurar ficheiros/directorias" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Restaurar Pasta de Fonte" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Salvaguardas disponíveis:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Usar personalizado:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Usar padrão:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Ficheiros e Pastas a restaurar" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Restaurar" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Restaurar como..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2422,71 +2346,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Restaurar" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "Reverter" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" - -#~ msgid "Revert As" -#~ msgstr "Reverter Como" diff -Nru sbackup-0.11.4/po/ro.po sbackup-0.11.6/po/ro.po --- sbackup-0.11.4/po/ro.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/ro.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:23+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,55 +42,57 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" George Silviu Enea https://launchpad.net/~premamotion" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -102,131 +104,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -336,65 +338,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Personalizat" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "" @@ -410,328 +412,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Cancelling pull of snapshot '%s'" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -743,18 +676,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -766,65 +699,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -914,8 +851,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1210,126 +1146,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1338,77 +1268,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1437,7 +1367,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1445,12 +1375,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1526,11 +1456,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1556,58 +1486,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1616,22 +1494,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1640,35 +1518,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1676,21 +1554,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1699,21 +1577,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1721,21 +1599,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1766,67 +1644,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2357,6 +2230,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2409,68 +2331,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/ru.po sbackup-0.11.6/po/ru.po --- sbackup-0.11.4/po/ru.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/ru.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,27 +7,27 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" -"PO-Revision-Date: 2011-01-17 11:45+0000\n" -"Last-Translator: Pavlenty \n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" +"PO-Revision-Date: 2011-02-14 05:46+0000\n" +"Last-Translator: Andrey Olykainen \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" -msgstr "" +msgstr "Служба SBackup <%(login)s@%(hostname)s>" #: src/sbackup/backupproc.py:173 #, python-format msgid "[SBackup] [%(profile)s] Report of %(date)s" -msgstr "" +msgstr "[SBackup] [%(profile)s] журнал от %(date)s" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "Файл журнала не указан." @@ -46,27 +46,27 @@ "\n" "Продолжаем обработку оставшихся профилей." -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "Резервное копирование отменено пользователем." -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "Произошла ошибка во время отмены резервного копирования:" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "Произошла ошибка во время резервного копирования:" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "Ошибка при отправке письма:" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "До этого произошли следующие ошибки:" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" @@ -75,7 +75,7 @@ "Резервное копирование не начинается.\n" "%s" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " @@ -85,25 +85,38 @@ "поиском ошибок, переводом или чем-нибудь еще пожалуйста, посетите наш веб-" "сайт." -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "Разработчики:" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "Прежние сопровождающие" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "Помогавшие:" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" +" Alexey Balmashnov https://launchpad.net/~a.balmashnov\n" +" Alexey Kotlyarov https://launchpad.net/~koterpillar\n" +" Andrey Olykainen https://launchpad.net/~andrey.olykainen\n" +" Andrey Zhekov https://launchpad.net/~x3ro.daemon\n" " Anton Snigiryov https://launchpad.net/~berkuteagle\n" +" Artem Vorotnikov https://launchpad.net/~vorot93\n" +" AsstZD https://launchpad.net/~eskaer-spamsink\n" +" Eugene Marshal https://launchpad.net/~lowrider\n" +" Gofer https://launchpad.net/~vovka\n" +" Ignat Loskutov https://launchpad.net/~softwayer\n" +" Igor Zubarev https://launchpad.net/~igor.zubarev\n" +" Ivan Kliouchenkov https://launchpad.net/~quick\n" " Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" " Pavlenty https://launchpad.net/~pavlenty\n" +" XPEH https://launchpad.net/~akidyarov\n" +" arruah https://launchpad.net/~arruah\n" " zdes06@mail.ru https://launchpad.net/~zdes06" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 @@ -116,58 +129,58 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "На текущий момент функция разделения не совместима со сжатием." -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "Невозможно изменить права доступа для файла '%s'" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "Невозможно удалить временный файл '%(file)s' : %(error)s" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "Запуск TAR для создания инкрементальной резервной копии." -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" "Невозможно найти SNAR-файл для создания инкрементальной резервной копии." -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "Возврат к полной резервной копии." -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "Запуск TAR для создания полной резервной копии." -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "TAR вернул сообщение: %s" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" @@ -176,16 +189,16 @@ "TAR вернул сообщения:\n" "%s" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "TAR завершен успешно." -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "Предупреждение от TAR: %s" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" @@ -194,58 +207,58 @@ "TAR вернул предупреждения:\n" "%s" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "TAR выдал предупреждение, но завершился успешно." -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "Не удалось завершить успешно. TAR прервался из-за ошибок." -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "Невозможно завершить фоновый процесс: %s" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "Включен" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "Без изменений" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "Каталог" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "Файл '%s' не существует." -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "Заголовок SNAR-файла неполный." -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "Требуется Snapshot-файл" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "Каталог не существует: %s" @@ -331,19 +344,19 @@ #: src/sbackup/core/ConfigManager.py:1163 msgid "No receiver set." -msgstr "" +msgstr "Нет получателя." #: src/sbackup/core/ConfigManager.py:1165 msgid "No SMTP server set." -msgstr "" +msgstr "Не выбран сервер SMTP." #: src/sbackup/core/ConfigManager.py:1168 msgid "Username set but no password specified." -msgstr "" +msgstr "Имя пользователя установлено, но пароль не задан." #: src/sbackup/core/ConfigManager.py:1171 msgid "Password set but no username specified." -msgstr "" +msgstr "Пароль установлен, но имя пользователя не задано." #: src/sbackup/core/ConfigManager.py:1174 msgid "" @@ -358,65 +371,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" -msgstr "" +msgstr "Стандартный профиль" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" -msgstr "" +msgstr "Неизвестный профиль" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" -msgstr "" +msgstr "Без ограничений" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" -msgstr "" +msgstr "100 МБ" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" -msgstr "" +msgstr "250 МБ" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" -msgstr "" +msgstr "650 МБ" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" -msgstr "" +msgstr "2 ГБ (FAT16)" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" -msgstr "" +msgstr "4 ГБ (FAT32)" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Пользовательский" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Музыка MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "Видео AVI" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "Видео MPEG" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Видео Matrjoshka" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "Мультимедиа OGG" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Образы CD" @@ -432,328 +445,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.5: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." -msgstr "" +msgstr "Количество директорий: %s." -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." -msgstr "" +msgstr "Всего файлов: %s." -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." -msgstr "" +msgstr "Доступное дисковое пространство '%s'." -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -765,20 +709,20 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" -msgstr "" +msgstr "SFTP" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" -msgstr "" +msgstr "SSH" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" -msgstr "" +msgstr "FTP" #: src/sbackup/fs_backend/_gio_fam.py:100 msgid "Initializing GIO File Access Manager." @@ -788,65 +732,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" -msgstr "" +msgstr "SMB" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" -msgstr "" +msgstr "Создать файл" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" -msgstr "" +msgstr "Удалить файл" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -936,8 +884,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1234,126 +1181,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1362,77 +1303,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1461,7 +1402,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1469,12 +1410,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1550,11 +1491,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1580,58 +1521,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1640,22 +1529,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1664,35 +1553,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1700,21 +1589,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1723,21 +1612,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1745,21 +1634,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1790,67 +1679,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2386,6 +2270,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Восстановить файлы/каталоги" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Восстановить исходный каталог" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Доступные резервные копии:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Использовать пользовательскую настройку:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Использовать по умолчанию:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Файлы и каталоги для восстановления" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Восстановить" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Восстановить как..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2438,74 +2371,72 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Восстановить" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" -#~ msgid "This is a user friendly backup solution for common desktop needs." -#~ msgstr "Удобное решение для организации резервного копирования файлов." +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "Обновление до v1.3: %s" + +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "Обновление с 1.0 до v1.2: %s" -#~ msgid "I didn't find the log file. Please set it up in sbackup.conf " -#~ msgstr "Лог-файл не найден. Задайте его в sbackup.conf " +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "Обновление до v1.5: %s" + +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "Обновление до v1.4: %s" diff -Nru sbackup-0.11.4/po/sbackup.pot sbackup-0.11.6/po/sbackup.pot --- sbackup-0.11.4/po/sbackup.pot 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/sbackup.pot 2013-09-17 20:50:00.000000000 +0200 @@ -8,15 +8,16 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -26,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -41,53 +42,53 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" @@ -101,131 +102,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -335,65 +336,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "" @@ -409,327 +410,258 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= '%" -"(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Cancelling pull of snapshot '%s'" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" -"Not enough free space in the target directory for the planned backup (free: %" -"(freespace)s, required: %(neededspace)s)." +"Not enough free space in the target directory for the planned backup (free: " +"%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -741,18 +673,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -764,65 +696,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -883,8 +819,8 @@ #: src/sbackup/fuse_plugins/sshFuseFAM.py:137 #, python-format msgid "" -"The sshfs command '%(command)s' didn't perform normally. Output => %" -"(erroroutput)s " +"The sshfs command '%(command)s' didn't perform normally. Output => " +"%(erroroutput)s " msgstr "" #: src/sbackup/fuse_plugins/sshFuseFAM.py:142 @@ -894,8 +830,8 @@ #: src/sbackup/fuse_plugins/sshFuseFAM.py:158 #, python-format msgid "" -"Error matching the schema 'ssh://user:pass@example.com:21/home/' with '%" -"s' (The '/' after server is mandatory)" +"Error matching the schema 'ssh://user:pass@example.com:21/home/' with " +"'%s' (The '/' after server is mandatory)" msgstr "" #: src/sbackup/ui/GladeWindow.py:210 @@ -912,8 +848,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1162,8 +1097,8 @@ #, python-format msgid "" "Set default values for current profile?\n" -"This will restore the default values for the profile currently edited: '%" -"s'.\n" +"This will restore the default values for the profile currently edited: " +"'%s'.\n" "\n" "These predefined settings are recommended for most users. Check whether they " "are appropriate for your use before saving the changed configuration." @@ -1208,126 +1143,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1336,77 +1265,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1435,7 +1364,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1443,12 +1372,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1524,11 +1453,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1554,58 +1483,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1614,22 +1491,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1638,35 +1515,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1674,21 +1551,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1697,21 +1574,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1719,21 +1596,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1764,66 +1641,61 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2354,6 +2226,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2406,68 +2327,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/sr.po sbackup-0.11.6/po/sr.po --- sbackup-0.11.4/po/sr.po 2011-02-13 18:22:15.000000000 +0100 +++ sbackup-0.11.6/po/sr.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:38+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,55 +42,57 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" Bojan Bogdanović https://launchpad.net/~bojce" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -102,131 +104,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -336,65 +338,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Прилагођен" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "МП3 музика" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "АВИ видео" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "МПЕГ видео" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Матрјошка видео" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "ОГГ мултимедија контејнер" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "ЦД слике" @@ -410,328 +412,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.3: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -743,18 +676,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -766,65 +699,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -914,8 +851,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1212,126 +1148,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1340,77 +1270,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1439,7 +1369,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1447,12 +1377,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1528,11 +1458,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1558,58 +1488,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1618,22 +1496,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1642,35 +1520,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1678,21 +1556,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1701,21 +1579,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1723,21 +1601,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1768,67 +1646,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2365,6 +2238,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Обнови датотеке/директоријуме" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Обнови изворни директоријум" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Доступне резервне копије" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Користи прилагођен:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Користи подразумеван:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Датотеке и директоријуми за обнављање" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Обнављање" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Обнови као..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2417,68 +2339,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Обнављање" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/sv.po sbackup-0.11.6/po/sv.po --- sbackup-0.11.4/po/sv.po 2011-02-13 18:22:17.000000000 +0100 +++ sbackup-0.11.6/po/sv.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:50+0000\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,59 +42,61 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Ulrik Sverdrup, Andreas Henriksson, Daniel Nylander 2006.\n" "\n" "Launchpad Contributions:\n" -" Daniel Nylander https://launchpad.net/~yeager" +" Daniel Nylander https://launchpad.net/~yeager\n" +" Ulr https://launchpad.net/~u78qir8a9\n" +" anonym https://launchpad.net/~launch-mailinator" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -106,131 +108,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "Kunde inte ändra rättigheter för filen \"%s\"." -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -340,65 +342,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Standardprofil" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Anpassad" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3-musik" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI-video" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG-video" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matrjoshka-video" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "OGG Multimedia-behållare" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Cd-avbilder" @@ -414,328 +416,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Unable to remove upgrade stamp: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -747,18 +680,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -770,65 +703,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -918,8 +855,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1215,126 +1151,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1343,77 +1273,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1442,7 +1372,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1450,12 +1380,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1531,11 +1461,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1561,58 +1491,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1621,22 +1499,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1645,35 +1523,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1681,21 +1559,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1704,21 +1582,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1726,21 +1604,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1771,67 +1649,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2368,6 +2241,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Återskapa filer/kataloger" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Återskapa källmapp" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Tillgängliga säkerhetskopior:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Använd anpassad:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Använd standard:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Filer och mappar att återskapa" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Återskapa" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Återskapa som..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2420,77 +2342,56 @@ msgid "Delete" msgstr "Ta bort" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Återskapa" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "Exporthantering" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "Rubrik" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "Innehåll" - -#~ msgid "No directories to backup !" -#~ msgstr "Inga kataloger att skapa en säkerhetskopia av!" - -#~ msgid "No directory to backup !" -#~ msgstr "Ingen katalog att skapa en säkerhetskopia av!" - -#~ msgid "Set the reciever of this mail" -#~ msgstr "Välj mottagaren av detta e-mail" diff -Nru sbackup-0.11.4/po/sw.po sbackup-0.11.6/po/sw.po --- sbackup-0.11.4/po/sw.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/sw.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:43+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Swahili \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,55 +42,57 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" Christoph Wickert https://launchpad.net/~cwickert" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -102,131 +104,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -336,65 +338,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Benutzerdefiniert" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3 Musik" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI Video" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG Video" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matrjoshka Video" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "" @@ -410,328 +412,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Cancelling pull of snapshot '%s'" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -743,18 +676,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -766,65 +699,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -914,8 +851,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1210,126 +1146,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1338,77 +1268,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1437,7 +1367,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1445,12 +1375,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1526,11 +1456,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1556,58 +1486,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1616,22 +1494,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1640,35 +1518,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1676,21 +1554,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1699,21 +1577,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1721,21 +1599,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1766,67 +1644,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2357,6 +2230,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2409,68 +2331,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/tr.po sbackup-0.11.6/po/tr.po --- sbackup-0.11.4/po/tr.po 2011-02-13 18:22:16.000000000 +0100 +++ sbackup-0.11.6/po/tr.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" -"PO-Revision-Date: 2010-10-13 17:04+0000\n" -"Last-Translator: Translate it \n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" +"PO-Revision-Date: 2011-02-06 11:38+0000\n" +"Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,27 +42,27 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "Yedekleme kullanıcı tarafından iptal edildi." -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "Yedekleme iptal edilirken bir hata oluştu." -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "Yedekleme sırasında bir hata oluştu:" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "E-posta gönderilirken hata oluştu:" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" @@ -71,33 +71,37 @@ "Yedekleme başlatılmadı.\n" "%s" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "Katkıda Bulunanlar:" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "çevirmen-teşekkürler\n" "\n" "Launchpad Contributions:\n" +" Baris Ozyurt https://launchpad.net/~barisozyurt\n" " Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" -" Translate it https://launchpad.net/~guglcimeil" +" Muhammet Kara https://launchpad.net/~muhammet-k\n" +" Translate it https://launchpad.net/~guglcimeil\n" +" mete13 https://launchpad.net/~muratcakir13\n" +" webdr https://launchpad.net/~drumut" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -109,131 +113,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "'%s' dosyası bulunamadı." -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -343,65 +347,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "Öntanımlı profil" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "Bilinmeyen Profil" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "Sınırsız" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Özel" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3 Müziği" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI Vidyosu" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG Vidyosu" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matrjoshka Vidyosu" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "OGG Çokluortam kapsayıcısı" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "CD Görüntüleri" @@ -417,328 +421,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Cancelling pull of snapshot '%s'" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "v1.0'dan v1.2'ye yükseltiliyor:%s" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "v13'e yükseltiliyor:%s" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "v14'e yükseltiliyor:%s" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "v15'e yükseltiliyor:%s" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "Yedekleme işlemi tamamlandı" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "Yedekleme özeti" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "Toplam dosya sayısı: %s." -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "En az '%s' boş alan gerekli." -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "Kullanılabilir disk boyutu '%s'." -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "Kullanıcının isteği üzerine profil işlemi iptal edildi\n" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "Profil işlemi başarıyla tamamlandı(Hatasız)\n" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -750,18 +685,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "Dosya Transfer Protokolü(FTP)" @@ -773,65 +708,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "Ağ Dosya Sistemi(NFS)" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "Dosya oluştur" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "Dosyayı sil" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -921,8 +860,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "Basit yedekleme hatası" @@ -1218,126 +1156,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1346,77 +1278,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1445,7 +1377,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1453,12 +1385,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1534,11 +1466,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1564,58 +1496,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1624,22 +1504,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1648,35 +1528,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1684,21 +1564,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1707,21 +1587,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1729,21 +1609,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1774,67 +1654,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2365,6 +2240,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Kullanılabilir yedekler:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Özel kullan:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Geri yüklenecek Dosyalar ve Klasörler" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Geri yükle" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Farklı Geri Yükle..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2417,68 +2341,72 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Geri yükle" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" + +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "v1.0'dan v1.2'ye yükseltiliyor:%s" + +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "v14'e yükseltiliyor:%s" + +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "v13'e yükseltiliyor:%s" + +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "v15'e yükseltiliyor:%s" diff -Nru sbackup-0.11.4/po/uk.po sbackup-0.11.6/po/uk.po --- sbackup-0.11.4/po/uk.po 2011-02-13 18:22:15.000000000 +0100 +++ sbackup-0.11.6/po/uk.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-10-05 13:52+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Ukrainian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "" @@ -42,59 +42,61 @@ "Now continue processing remaining profiles." msgstr "" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Перекладачі\n" "\n" "Launchpad Contributions:\n" -" Jean-Peer Lorenz https://launchpad.net/~peer.loz" +" Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" +" Lufa https://launchpad.net/~yuriy.smetana\n" +" Vlad Kozlovskyy https://launchpad.net/~dbdeveloper" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 @@ -106,131 +108,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -340,65 +342,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "Власні:" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "Аудіо-файли у форматі MP3" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "Файли Відео AVI" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "Файли Відео MPEG" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Файли Відео Матроска" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "Мультимедійний контейнер OGG" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "Образи компакт-дисків" @@ -414,328 +416,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.3: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -747,18 +680,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -770,65 +703,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -918,8 +855,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1215,126 +1151,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1343,77 +1273,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1442,7 +1372,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1450,12 +1380,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1531,11 +1461,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1561,58 +1491,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1621,22 +1499,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1645,35 +1523,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1681,21 +1559,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1704,21 +1582,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1726,21 +1604,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1771,67 +1649,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2367,6 +2240,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "Відновлення файлів/директорій" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "Папка з резервними копіями" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "Доступні резервні копії:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "Використ.власний:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "Використ.стандартний:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "Файли і Папки для відновлення" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "Відновлення" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "Відновити як..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2419,68 +2341,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "Відновлення" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" diff -Nru sbackup-0.11.4/po/zh_CN.po sbackup-0.11.6/po/zh_CN.po --- sbackup-0.11.4/po/zh_CN.po 2011-02-13 18:22:17.000000000 +0100 +++ sbackup-0.11.6/po/zh_CN.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" -"PO-Revision-Date: 2010-10-05 13:28+0000\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" +"PO-Revision-Date: 2011-02-06 11:46+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" msgstr "" @@ -27,7 +27,7 @@ msgid "[SBackup] [%(profile)s] Report of %(date)s" msgstr "" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." msgstr "未指定日志文件。" @@ -44,57 +44,59 @@ "严重错误:缺省配置中无设置文件!\n" "现在继续处理剩下的配置。" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." msgstr "备份被用户取消" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" msgstr "" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" msgstr "备份时出错:" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" msgstr "发送邮件时出错:" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" msgstr "之前遇到的错误:" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." msgstr "" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" msgstr "维护者:" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" msgstr "" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" msgstr "贡献者:" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" " Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" +" xyb https://launchpad.net/~xieyanbo\n" +" 冯超 https://launchpad.net/~rainofchaos\n" " 唐微南 https://launchpad.net/~twn39" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 @@ -107,131 +109,131 @@ msgid "Effective path for `%s` is not available" msgstr "" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" msgstr "" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." msgstr "" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." msgstr "无法改变文件 '%s' 的权限。" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" msgstr "" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." msgstr "" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." msgstr "" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "TAR 返回信息:%s" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." msgstr "" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." msgstr "" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" msgstr "包含" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" msgstr "" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" msgstr "目录" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" msgstr "" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" msgstr "" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." msgstr "文件‘%s’不存在." -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." msgstr "" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" msgstr "" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." msgstr "" @@ -341,65 +343,65 @@ "is mandatory." msgstr "" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" msgstr "" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" msgstr "" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" msgstr "" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" msgstr "" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" msgstr "定制" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" msgstr "MP3 音乐" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" msgstr "AVI 视频" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" msgstr "MPEG 视频" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" msgstr "Matrjoshka 视频" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" msgstr "OGG 多媒体容器" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" msgstr "CD 镜像" @@ -415,328 +417,259 @@ "Skipped." msgstr "" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " msgstr "" -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." msgstr "" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." msgstr "" -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" msgstr "" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." msgstr "" -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "Upgrading to v1.4: %s" +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:300 -#, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." -msgstr "" - -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" msgstr "" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." msgstr "" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." msgstr "" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." msgstr "" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " msgstr "" -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." msgstr "" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" msgstr "" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" msgstr "" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." msgstr "" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." msgstr "" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" msgstr "" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." msgstr "" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" msgstr "" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" msgstr "" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." msgstr "" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." msgstr "" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." msgstr "" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." msgstr "" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." msgstr "" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." msgstr "" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." msgstr "" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" msgstr "" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" msgstr "" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" msgstr "" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." msgstr "" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." msgstr "" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." msgstr "" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" msgstr "" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " msgstr "" -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" msgstr "" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " msgstr "" -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" msgstr "" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " msgstr "" -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" msgstr "" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" msgstr "" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" msgstr "" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." msgstr "" @@ -748,18 +681,18 @@ msgid "Terminating FUSE File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" msgstr "" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" msgstr "" @@ -771,65 +704,69 @@ msgid "Terminating GIO File Access Manager." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" +msgstr "" + +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" msgstr "" @@ -919,8 +856,7 @@ "%s." msgstr "" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" msgstr "" @@ -1215,126 +1151,120 @@ msgid "there was a problem initializing the pynotify module" msgstr "" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" msgstr "" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" msgstr "" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." msgstr "" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" msgstr "" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." msgstr "" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" msgstr "" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" msgstr "" -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" - -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." msgstr "" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" msgstr "" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" msgstr "" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" msgstr "" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." msgstr "" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" msgstr "" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" msgstr "" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" msgstr "" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1343,77 +1273,77 @@ "\n" msgstr "" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." msgstr "" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" msgstr "" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" msgstr "" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" msgstr "" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" msgstr "" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" msgstr "" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" msgstr "" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" msgstr "" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" msgstr "" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" msgstr "" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." msgstr "" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" msgstr "" @@ -1442,7 +1372,7 @@ msgid "Restore..." msgstr "" -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." msgstr "" @@ -1450,12 +1380,12 @@ msgid "Revert..." msgstr "" -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." msgstr "" #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." msgstr "" @@ -1531,11 +1461,11 @@ msgid "No backups found for this day." msgstr "" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1561,58 +1491,6 @@ msgstr "" #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1621,22 +1499,22 @@ "Are you sure that you want to remove the snapshot permanently?" msgstr "" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" msgstr "" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1645,35 +1523,35 @@ "Remove all of these child snapshots in order to delete this snapshot." msgstr "" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" msgstr "" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" msgstr "" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" msgstr "" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" @@ -1681,21 +1559,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1704,21 +1582,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" msgstr "" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" msgstr "" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" @@ -1726,21 +1604,21 @@ "Following error occurred:\n" msgstr "" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1771,67 +1649,62 @@ #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." msgstr "" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." msgstr "" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." msgstr "" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgid "File '%(file)s' is backup's target directory." msgstr "" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgid "Path '%(file)s' defined in excludes list." msgstr "" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." msgstr "" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." msgstr "" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." msgstr "" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." msgstr "" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." msgstr "" @@ -2364,6 +2237,55 @@ msgid "Make a full backup" msgstr "" +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "恢复文件/目录" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "恢复原始文件夹" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "可用的备份:" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "使用自定义:" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "使用默认:" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "要恢复的文件和文件夹" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "恢复" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "恢复为..." + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" +msgstr "" + #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" msgstr "" @@ -2416,107 +2338,56 @@ msgid "Delete" msgstr "" -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" - -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" msgstr "" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" msgstr "" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." msgstr "" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" msgstr "" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" msgstr "" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" msgstr "" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "恢复" - -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" msgstr "" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" msgstr "" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" msgstr "" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" msgstr "" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" msgstr "" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" msgstr "" - -#~ msgid "Failed to set the gid to 'admin' one :" -#~ msgstr "设置 GID 为“admin” 失败:" - -#~ msgid "Starting snapshot %(name)s " -#~ msgstr "开始快照 %(name)s " - -#~ msgid "Setting Base to '%(value)s' " -#~ msgstr "设基地为'%(value)s' " - -#~ msgid "'%(file)s' doesn't exist, it has to be exclude " -#~ msgstr "'%(file)s'非存在,务必排除 " - -#~ msgid "I didn't find the log file. Please set it up in sbackup.conf " -#~ msgstr "未找到日志文件。请在 sbackup.conf 中设置。 " - -#~ msgid "Target '%s' directory is excluded" -#~ msgstr "目标'%s'文件夹被排除" - -#~ msgid "Problem with '%(file)s' : %(error)s " -#~ msgstr "'%(file)s' 出问题:%(error)s " - -#~ msgid "Empty regular expression found. " -#~ msgstr "找到了空正则表达式。 " - -#~ msgid "Invalid regular expression ('%s')" -#~ msgstr "无效的正则表达式 ('%s')" - -#~ msgid "No directory to backup !" -#~ msgstr "没有要备份的文件夹!" - -#~ msgid "" -#~ "We don't have read access to '%(file)s', it has to be exclude : %(error)s " -#~ msgstr "我们没有“%(file)s” 的读权限,需要排除:%(error)s " - -#~ msgid "" -#~ "'%(file)s' size is higher than the specified one ( %(filesize)s > " -#~ "%(maxsize)s), it has to be exclude " -#~ msgstr "'%(file)s'的大小比指定的大(%(filesize)s > %(maxsize)s),必须排除。 " diff -Nru sbackup-0.11.4/po/zh_TW.po sbackup-0.11.6/po/zh_TW.po --- sbackup-0.11.4/po/zh_TW.po 2011-02-13 18:22:17.000000000 +0100 +++ sbackup-0.11.6/po/zh_TW.po 2013-09-17 20:50:00.000000000 +0200 @@ -7,33 +7,33 @@ msgstr "" "Project-Id-Version: sbackup\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-04 21:54+0100\n" +"POT-Creation-Date: 2013-01-10 22:47+0100\n" "PO-Revision-Date: 2010-09-25 00:27+0000\n" "Last-Translator: Jean-Peer Lorenz \n" "Language-Team: Chinese (Taiwan) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-05 05:38+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2013-01-11 04:47+0000\n" +"X-Generator: Launchpad (build 16412)\n" -#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:68 +#: src/sbackup/backupproc.py:169 src/sbackup/pkginfo.py:85 #, python-format msgid "SBackup Daemon <%(login)s@%(hostname)s>" -msgstr "" +msgstr "SBackup 常駐 <%(login)s@%(hostname)s>" #: src/sbackup/backupproc.py:173 #, python-format msgid "[SBackup] [%(profile)s] Report of %(date)s" -msgstr "" +msgstr "[SBackup] [%(profile)s] 於 %(date)s 的報告" -#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:278 +#: src/sbackup/backupproc.py:178 src/sbackup/core/profile_handler.py:282 msgid "No log file specified." -msgstr "" +msgstr "沒有指定的日誌檔。" #: src/sbackup/backupproc.py:183 msgid "Unable to find log file." -msgstr "" +msgstr "無法找到日誌檔。" #: src/sbackup/backupproc.py:251 msgid "" @@ -41,213 +41,224 @@ "\n" "Now continue processing remaining profiles." msgstr "" +"嚴重錯誤:未發現任何預設設定檔!\n" +"\n" +"現在將繼續進行其他設定檔的作業。" -#: src/sbackup/backupproc.py:300 +#: src/sbackup/backupproc.py:302 msgid "Backup was canceled by user." -msgstr "" +msgstr "備份動作已被使用者取消。" -#: src/sbackup/backupproc.py:305 +#: src/sbackup/backupproc.py:307 msgid "An error occurred during the cancellation of backup:" -msgstr "" +msgstr "取消備份作業時發生錯誤:" -#: src/sbackup/backupproc.py:311 +#: src/sbackup/backupproc.py:313 msgid "An error occurred during the backup:" -msgstr "" +msgstr "備份過程中發生錯誤:" -#: src/sbackup/backupproc.py:328 +#: src/sbackup/backupproc.py:330 msgid "Error when sending email:" -msgstr "" +msgstr "傳送郵件時發生錯誤:" -#: src/sbackup/backupproc.py:359 +#: src/sbackup/backupproc.py:361 msgid "The following error(s) occurred before:" -msgstr "" +msgstr "之前遇到的錯誤:" -#: src/sbackup/backupproc.py:530 +#: src/sbackup/backupproc.py:532 #, python-format msgid "" "Backup is not being started.\n" "%s" msgstr "" +"備份尚未開始。\n" +"%s" -#: src/sbackup/pkginfo.py:40 +#: src/sbackup/pkginfo.py:42 msgid "" "This is a user friendly backup solution for common desktop needs. If you " "want to help by submitting bugs, by translating or anything else please " "visit our website." -msgstr "" +msgstr "這是一個滿足桌面需求且容易上手的備份解決方案。若您想要回報 bug、翻譯或協助其他事項,請造訪我們的網站。" -#: src/sbackup/pkginfo.py:43 +#: src/sbackup/pkginfo.py:45 msgid "Maintainers:" -msgstr "" +msgstr "維護者:" -#: src/sbackup/pkginfo.py:47 +#: src/sbackup/pkginfo.py:49 msgid "Former maintainers:" -msgstr "" +msgstr "前維護者:" -#: src/sbackup/pkginfo.py:51 +#: src/sbackup/pkginfo.py:53 msgid "Contributors:" -msgstr "" +msgstr "貢獻者:" -#: src/sbackup/pkginfo.py:56 +#: src/sbackup/pkginfo.py:70 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" -" Jean-Peer Lorenz https://launchpad.net/~peer.loz" +" Jean-Peer Lorenz https://launchpad.net/~peer.loz\n" +" Pin-hsien Li https://launchpad.net/~plesry\n" +" yiulok https://launchpad.net/~lkinglok" #: src/sbackup/ar_backend/tar.py:109 src/sbackup/ar_backend/tar.py:167 #: src/sbackup/ar_backend/tar.py:213 msgid "Invalid archive type." -msgstr "" +msgstr "無效的檔案類型。" #: src/sbackup/ar_backend/tar.py:123 #, python-format msgid "Effective path for `%s` is not available" -msgstr "" +msgstr "「%s」的有效路徑並不可用" -#: src/sbackup/ar_backend/tar.py:294 +#: src/sbackup/ar_backend/tar.py:295 #, python-format msgid "Unable to get effective path for `%s`" -msgstr "" +msgstr "無法取得「%s」的有效路徑" -#: src/sbackup/ar_backend/tar.py:338 +#: src/sbackup/ar_backend/tar.py:344 msgid "" "For the moment split functionality is not compatible with compress option." -msgstr "" +msgstr "目前分割功能無法和壓縮選項相容。" -#: src/sbackup/ar_backend/tar.py:347 src/sbackup/ar_backend/tar.py:408 -#: src/sbackup/core/profile_handler.py:288 +#: src/sbackup/ar_backend/tar.py:353 src/sbackup/ar_backend/tar.py:414 +#: src/sbackup/core/profile_handler.py:292 #, python-format msgid "Unable to change permissions for file '%s'." -msgstr "" +msgstr "無法更改檔案「%s」的權限。" -#: src/sbackup/ar_backend/tar.py:356 +#: src/sbackup/ar_backend/tar.py:362 #, python-format msgid "Unable to remove temporary file `%(file)s`: %(error)s" -msgstr "" +msgstr "無法移除暫存檔案「%(file)s」:%(error)s" -#: src/sbackup/ar_backend/tar.py:372 +#: src/sbackup/ar_backend/tar.py:378 msgid "Launching TAR to make incremental backup." -msgstr "" +msgstr "啟動 TAR 以進行增量備份。" -#: src/sbackup/ar_backend/tar.py:401 +#: src/sbackup/ar_backend/tar.py:407 msgid "Unable to find the SNAR file to make an incremental backup." -msgstr "" +msgstr "未發現進行增量備份所需的 SNAR 檔。" -#: src/sbackup/ar_backend/tar.py:402 +#: src/sbackup/ar_backend/tar.py:408 msgid "Falling back to full backup." -msgstr "" +msgstr "回到完整備份模式。" -#: src/sbackup/ar_backend/tar.py:444 +#: src/sbackup/ar_backend/tar.py:450 msgid "Launching TAR to make a full backup." -msgstr "" +msgstr "啟動 TAR 以建立完整備份。" -#: src/sbackup/ar_backend/tar.py:511 +#: src/sbackup/ar_backend/tar.py:517 msgid "Leading '/' from member names were removed." -msgstr "" +msgstr "從成員名稱中移除前端的「/」。" -#: src/sbackup/ar_backend/tar.py:513 +#: src/sbackup/ar_backend/tar.py:519 msgid "Leading '/' from hard link targets were removed." -msgstr "" +msgstr "從硬連結目標中移除前端的「/」。" -#: src/sbackup/ar_backend/tar.py:522 +#: src/sbackup/ar_backend/tar.py:528 #, python-format msgid "TAR returned a message: %s" -msgstr "" +msgstr "TAR 傳回了一個訊息:%s" -#: src/sbackup/ar_backend/tar.py:524 +#: src/sbackup/ar_backend/tar.py:530 #, python-format msgid "" "TAR returned messages:\n" "%s" msgstr "" +"TAR 傳回了訊息:\n" +"%s" -#: src/sbackup/ar_backend/tar.py:527 +#: src/sbackup/ar_backend/tar.py:533 msgid "TAR has been finished successfully." -msgstr "" +msgstr "TAR 已順利完成執行。" -#: src/sbackup/ar_backend/tar.py:531 +#: src/sbackup/ar_backend/tar.py:537 #, python-format msgid "TAR returned a warning: %s" -msgstr "" +msgstr "TAR 傳回了一個警告:%s" -#: src/sbackup/ar_backend/tar.py:533 +#: src/sbackup/ar_backend/tar.py:539 #, python-format msgid "" "TAR returned warnings:\n" "%s" msgstr "" +"TAR 傳回了警告:\n" +"%s" -#: src/sbackup/ar_backend/tar.py:536 +#: src/sbackup/ar_backend/tar.py:542 msgid "TAR returned warnings but has been finished successfully." -msgstr "" +msgstr "TAR 傳回了警告但成功完成執行。" -#: src/sbackup/ar_backend/tar.py:540 +#: src/sbackup/ar_backend/tar.py:546 msgid "Unable to finish successfully. TAR terminated with errors." -msgstr "" +msgstr "無法成功完成執行。TAR 因為錯誤而被中斷。" -#: src/sbackup/ar_backend/tar.py:721 +#: src/sbackup/ar_backend/tar.py:727 #, python-format msgid "Unable to terminate backend process: %s" -msgstr "" +msgstr "無法中止後端作業:%s" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Included" -msgstr "" +msgstr "已包含" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Not changed" -msgstr "" +msgstr "未改變" -#: src/sbackup/ar_backend/tar.py:754 +#: src/sbackup/ar_backend/tar.py:760 msgid "Directory" -msgstr "" +msgstr "資料夾" -#: src/sbackup/ar_backend/tar.py:782 +#: src/sbackup/ar_backend/tar.py:788 msgid "Line must be a string" -msgstr "" +msgstr "陣列必須為字串" -#: src/sbackup/ar_backend/tar.py:798 +#: src/sbackup/ar_backend/tar.py:804 msgid "Dumpdir inconsistancy : 'filename' is empty" -msgstr "" +msgstr "Dumpir 不符合:「filename」是空的" -#: src/sbackup/ar_backend/tar.py:811 +#: src/sbackup/ar_backend/tar.py:817 msgid "Dumpdir inconsistancy : 'control' is empty" -msgstr "" +msgstr "Dumpir 不符合:「control」是空的" -#: src/sbackup/ar_backend/tar.py:884 +#: src/sbackup/ar_backend/tar.py:890 #, python-format msgid "File '%s' does not exist." -msgstr "" +msgstr "檔案「%s」不存在。" -#: src/sbackup/ar_backend/tar.py:1014 src/sbackup/ar_backend/tar.py:1048 -#: src/sbackup/ar_backend/tar.py:1148 +#: src/sbackup/ar_backend/tar.py:1020 src/sbackup/ar_backend/tar.py:1054 +#: src/sbackup/ar_backend/tar.py:1154 msgid "The snarfile header is incomplete." -msgstr "" +msgstr "snar 檔案的標頭檔並不完全。" -#: src/sbackup/ar_backend/tar.py:1317 +#: src/sbackup/ar_backend/tar.py:1323 msgid "A SnapshotFile is required" -msgstr "" +msgstr "需要快照檔案" -#: src/sbackup/ar_backend/tar.py:1417 +#: src/sbackup/ar_backend/tar.py:1423 #, python-format msgid "Directory does not exist: %s." -msgstr "" +msgstr "資料夾不存在:%s。" #: src/sbackup/core/ConfigManager.py:330 #, python-format msgid "Profile settings are being read from file '%s'." -msgstr "" +msgstr "從檔案「%s」讀取設定檔。" #: src/sbackup/core/ConfigManager.py:333 #, python-format msgid "" "Profile settings are being set to default values. Configuration file is set " "to '%s'." -msgstr "" +msgstr "設定檔內的設定被設為預設值。設定檔為「%s」。" #: src/sbackup/core/ConfigManager.py:479 msgid "Option 'target' is missing, aborting." -msgstr "" +msgstr "選項「target」已遺失,退出。" #: src/sbackup/core/ConfigManager.py:547 #, python-format @@ -258,72 +269,77 @@ "\n" "Please check your configuration file." msgstr "" +"在執行設定檔時發生錯誤:\n" +"\n" +"%(error)s 於行 「%(line)s」。\n" +"\n" +"請檢查您的設定檔案。" #: src/sbackup/core/ConfigManager.py:588 src/sbackup/core/ConfigManager.py:622 #, python-format msgid "" "Unable to evaluate '%(parameter)s' as a dictionary (value got = '%(value)r')." -msgstr "" +msgstr "無法將「%(parameter)s」評估為字典物件 (得到的值為 = 「%(value)r」)。" #: src/sbackup/core/ConfigManager.py:614 #, python-format msgid "" "Couldn't evaluate '%(parameter)s' as a dictionary (value got = '%(value)r' )" -msgstr "" +msgstr "無法將「%(parameter)s」評估為字典物件 (得到的值為 = 「%(value)r」)" #: src/sbackup/core/ConfigManager.py:638 msgid "You must provide a dictionary." -msgstr "" +msgstr "您必須提供一個字典物件。" #: src/sbackup/core/ConfigManager.py:755 #, python-format msgid "Log output for [%(profile)s] is directed to file '%(file)s'." -msgstr "" +msgstr "[%(profile)s] 的日誌檔輸出至檔案「%(file)s」。" #: src/sbackup/core/ConfigManager.py:762 #, python-format msgid "Log output for [%s] is not directed into a file." -msgstr "" +msgstr "[%s] 的日誌檔並未輸出至檔案。" #: src/sbackup/core/ConfigManager.py:781 #, python-format msgid "Unable to rename log file '%(src)s'->'%(dst)s': %(err)s" -msgstr "" +msgstr "無法重新命名日誌檔 「%(src)s」->「%(dst)s」:%(err)s" #: src/sbackup/core/ConfigManager.py:801 #, python-format msgid "The config file '%s' couldn't be read!" -msgstr "" +msgstr "無法讀取設定檔「%s」!" #: src/sbackup/core/ConfigManager.py:813 #, python-format msgid "section [%(section)s] in '%(configfile)s' should not exist, aborting" -msgstr "" +msgstr "「%(configfile)s」內的區塊 [%(section)s] 不應該存在,退出" #: src/sbackup/core/ConfigManager.py:895 msgid "No schedule defined in configuration file. Probing from filesystem." -msgstr "" +msgstr "設定檔沒有定義排程。從檔案系統中探測。" #: src/sbackup/core/ConfigManager.py:988 #: src/sbackup/core/ConfigManager.py:1000 msgid "The config file is not set yet into this ConfigManager" -msgstr "" +msgstr "設定檔尚未從設定檔管理員中設置好" #: src/sbackup/core/ConfigManager.py:1163 msgid "No receiver set." -msgstr "" +msgstr "尚未設定接收端。" #: src/sbackup/core/ConfigManager.py:1165 msgid "No SMTP server set." -msgstr "" +msgstr "尚未設定 SMTP 伺服器。" #: src/sbackup/core/ConfigManager.py:1168 msgid "Username set but no password specified." -msgstr "" +msgstr "帳號已設定,但尚未指定密碼。" #: src/sbackup/core/ConfigManager.py:1171 msgid "Password set but no username specified." -msgstr "" +msgstr "密碼已設定,但尚未指定帳號。" #: src/sbackup/core/ConfigManager.py:1174 msgid "" @@ -331,582 +347,519 @@ "set.\n" "Select SSL in order to use Certificate and Key." msgstr "" +"憑證和密鑰檔已提供,但 SSL 選項 (smtptls=1) 尚未設置。\n" +"選擇 SSL 以使用憑證和密鑰。" #: src/sbackup/core/ConfigManager.py:1178 msgid "" "When specifying a SSL certificate or key file, a key file resp. certificate " "is mandatory." -msgstr "" +msgstr "在指定 SSL 憑證或密鑰檔時,鑰匙檔或憑證是必須準備的。" -#: src/sbackup/core/ConfigManager.py:1369 +#: src/sbackup/core/ConfigManager.py:1373 msgid "Default Profile" -msgstr "" +msgstr "預設設定檔" -#: src/sbackup/core/ConfigManager.py:1370 +#: src/sbackup/core/ConfigManager.py:1374 msgid "Unknown Profile" -msgstr "" +msgstr "未知的設定檔" -#: src/sbackup/core/ConfigManager.py:1423 +#: src/sbackup/core/ConfigManager.py:1428 msgid "Unlimited" -msgstr "" +msgstr "沒有限制" -#: src/sbackup/core/ConfigManager.py:1424 +#: src/sbackup/core/ConfigManager.py:1429 msgid "100 MiB" -msgstr "" +msgstr "100 MiB" -#: src/sbackup/core/ConfigManager.py:1425 +#: src/sbackup/core/ConfigManager.py:1430 msgid "250 MiB" -msgstr "" +msgstr "250 MiB" -#: src/sbackup/core/ConfigManager.py:1426 +#: src/sbackup/core/ConfigManager.py:1431 msgid "650 MiB" -msgstr "" +msgstr "650 MiB" -#: src/sbackup/core/ConfigManager.py:1427 +#: src/sbackup/core/ConfigManager.py:1432 msgid "2 GiB (FAT16)" -msgstr "" +msgstr "2 GiB (FAT16)" -#: src/sbackup/core/ConfigManager.py:1428 +#: src/sbackup/core/ConfigManager.py:1433 msgid "4 GiB (FAT32)" -msgstr "" +msgstr "4 GiB (FAT32)" -#: src/sbackup/core/ConfigManager.py:1429 src/sbackup/ui/configgui.py:279 +#: src/sbackup/core/ConfigManager.py:1434 src/sbackup/ui/configgui.py:279 #: src/sbackup/ui/configgui.py:1418 msgid "Custom" -msgstr "" +msgstr "自訂" -#: src/sbackup/core/ConfigManager.py:1431 +#: src/sbackup/core/ConfigManager.py:1436 msgid "MP3 Music" -msgstr "" +msgstr "MP3 音樂檔" -#: src/sbackup/core/ConfigManager.py:1432 +#: src/sbackup/core/ConfigManager.py:1437 msgid "AVI Video" -msgstr "" +msgstr "AVI 影音檔" -#: src/sbackup/core/ConfigManager.py:1433 -#: src/sbackup/core/ConfigManager.py:1434 +#: src/sbackup/core/ConfigManager.py:1438 +#: src/sbackup/core/ConfigManager.py:1439 msgid "MPEG Video" -msgstr "" +msgstr "MPEG 影音檔" -#: src/sbackup/core/ConfigManager.py:1435 +#: src/sbackup/core/ConfigManager.py:1440 msgid "Matrjoshka Video" -msgstr "" +msgstr "Matrjoshka 影音檔" -#: src/sbackup/core/ConfigManager.py:1436 +#: src/sbackup/core/ConfigManager.py:1441 msgid "OGG Multimedia container" -msgstr "" +msgstr "OGG 多媒體容器" -#: src/sbackup/core/ConfigManager.py:1437 +#: src/sbackup/core/ConfigManager.py:1442 msgid "CD Images" -msgstr "" +msgstr "CD 映像檔" #: src/sbackup/core/RestoreManager.py:80 #, python-format msgid "File '%s' not found in the backup snapshot files list" -msgstr "" +msgstr "備份快照的檔案列表中未發現檔案「%s」" #: src/sbackup/core/RestoreManager.py:82 #, python-format msgid "" "File '%(filename)s' not found in snapshot's [%(snapshotname)s] files list, " "Skipped." -msgstr "" +msgstr "檔案「%(filename)s」未被發現於快照 [%(snapshotname)s] 的檔案列表,跳過。" -#: src/sbackup/core/SnapshotManager.py:119 +#: src/sbackup/core/SnapshotManager.py:114 #, python-format msgid "Snapshot '%s' not found " -msgstr "" +msgstr "未發現快照「%s」 " -#: src/sbackup/core/SnapshotManager.py:213 +#: src/sbackup/core/SnapshotManager.py:210 #, python-format msgid "Invalid snapshot `%(name)s` found: Name of snapshot not valid." -msgstr "" +msgstr "發現無效快照「%(name)s」:無效的快照名稱。" -#: src/sbackup/core/SnapshotManager.py:216 +#: src/sbackup/core/SnapshotManager.py:213 #, python-format msgid "Invalid snapshot `%(name)s` found: %(error_cause)s." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:305 -#, python-format -msgid "No need to rebase a full snapshot '%s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:307 -#, python-format -msgid "" -"'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:312 -#, python-format -msgid "" -"Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " -"'%(NewBaseSnapshot)s' " -msgstr "" +msgstr "發現無效快照「%(name)s」:%(error_cause)s。" -#: src/sbackup/core/SnapshotManager.py:319 -#, python-format -msgid "Rebasing '%(current)s' on '%(base)s'" -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:556 -#, python-format -msgid "An error occurred when pulling snapshot '%s'." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:595 +#: src/sbackup/core/SnapshotManager.py:286 msgid "The snarfile header is incomplete !" -msgstr "" +msgstr "snar 檔案的標頭檔並不完全!" -#: src/sbackup/core/SnapshotManager.py:747 -#, python-format -msgid "Base of snapshot '%s' is not set." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:784 +#: src/sbackup/core/SnapshotManager.py:429 #, python-format msgid "" "Snapshot '%s' is already Full, nothing to do (not changing it to full)." -msgstr "" - -#: src/sbackup/core/SnapshotManager.py:824 -#, python-format -msgid "Cancelling pull of snapshot '%s'" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:176 -#, python-format -msgid "Unable to remove upgrade stamp: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:183 -#, python-format -msgid "Upgrading from v1.0 to v1.2: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:202 -#, python-format -msgid "Upgrading to v1.3: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:229 -#, python-format -msgid "Upgrading to v1.4: %s" -msgstr "" - -#: src/sbackup/core/UpgradeManager.py:246 -#, python-format -msgid "Upgrading to v1.5: %s" -msgstr "" +msgstr "快照「%s」已經是完整的,不需做任何事 (不用將其變更為完整)。" -#: src/sbackup/core/UpgradeManager.py:300 +#: src/sbackup/core/profile_handler.py:101 #, python-format -msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." +msgid "Running of hooks: %s" msgstr "" -#: src/sbackup/core/profile_handler.py:90 +#: src/sbackup/core/profile_handler.py:111 msgid "Preparation of backup process" -msgstr "" +msgstr "準備備份作業" -#: src/sbackup/core/profile_handler.py:133 -msgid "" -"There are snapshots stored in outdated snapshot formats. Please upgrade them " -"using 'Simple Backup-Restoration' if you want to use them." -msgstr "" - -#: src/sbackup/core/profile_handler.py:142 +#: src/sbackup/core/profile_handler.py:146 #, python-format msgid "Snapshot '%(name)s' is being made." -msgstr "" +msgstr "快照「%(name)s」建立。" -#: src/sbackup/core/profile_handler.py:150 +#: src/sbackup/core/profile_handler.py:154 #, python-format msgid "Setting Base to '%(value)s'." -msgstr "" +msgstr "基底設置為「%(value)s」。" -#: src/sbackup/core/profile_handler.py:159 +#: src/sbackup/core/profile_handler.py:163 msgid "Setting packages File." -msgstr "" +msgstr "設定包裝檔案。" -#: src/sbackup/core/profile_handler.py:165 +#: src/sbackup/core/profile_handler.py:169 msgid "Problem when setting the packages list: " -msgstr "" +msgstr "當設定包裝列表時發生問題: " -#: src/sbackup/core/profile_handler.py:169 +#: src/sbackup/core/profile_handler.py:173 msgid "Setting Excludes File." -msgstr "" +msgstr "設定要被排除的檔案。" -#: src/sbackup/core/profile_handler.py:177 +#: src/sbackup/core/profile_handler.py:181 #, python-format msgid "Setting compression format to `%s`" -msgstr "" +msgstr "將壓縮格式設定為「%s」" -#: src/sbackup/core/profile_handler.py:184 +#: src/sbackup/core/profile_handler.py:188 #, python-format msgid "Setting size of archive chunks to %s" -msgstr "" +msgstr "將檔案分割大小設定為 %s" -#: src/sbackup/core/profile_handler.py:191 +#: src/sbackup/core/profile_handler.py:195 msgid "Option 'Follow symbolic links' is enabled." -msgstr "" +msgstr "選項「追隨符號連結」已啟用。" -#: src/sbackup/core/profile_handler.py:193 +#: src/sbackup/core/profile_handler.py:197 msgid "Option 'Follow symbolic links' is disabled." -msgstr "" +msgstr "選項「追隨符號連結」已停用。" -#: src/sbackup/core/profile_handler.py:202 +#: src/sbackup/core/profile_handler.py:206 msgid "Snapshot is being committed" -msgstr "" +msgstr "快照已經送出" -#: src/sbackup/core/profile_handler.py:216 +#: src/sbackup/core/profile_handler.py:220 #, python-format msgid "Error while purging old snapshots: %s" -msgstr "" +msgstr "在清理舊快照時發生錯誤:%s" -#: src/sbackup/core/profile_handler.py:218 +#: src/sbackup/core/profile_handler.py:222 msgid "Backup process finished." -msgstr "" +msgstr "備份作業完成。" -#: src/sbackup/core/profile_handler.py:225 +#: src/sbackup/core/profile_handler.py:229 msgid "Inspect file system and collect file infos" -msgstr "" +msgstr "調查檔案系統並蒐集檔案資訊" -#: src/sbackup/core/profile_handler.py:236 +#: src/sbackup/core/profile_handler.py:240 msgid "Summary of backup" -msgstr "" +msgstr "備份摘要" -#: src/sbackup/core/profile_handler.py:237 +#: src/sbackup/core/profile_handler.py:241 #, python-format msgid "Number of directories: %s." -msgstr "" +msgstr "資料夾數目:%s。" -#: src/sbackup/core/profile_handler.py:238 +#: src/sbackup/core/profile_handler.py:242 #, python-format msgid "Total number of files: %s." -msgstr "" +msgstr "檔案總數:%s。" -#: src/sbackup/core/profile_handler.py:239 +#: src/sbackup/core/profile_handler.py:243 #, python-format msgid "Number of symlinks: %s." -msgstr "" +msgstr "軟連結數量:%s。" -#: src/sbackup/core/profile_handler.py:240 +#: src/sbackup/core/profile_handler.py:244 #, python-format msgid "Number of files included in snapshot: %s." -msgstr "" +msgstr "快照內的檔案數量:%s。" -#: src/sbackup/core/profile_handler.py:241 +#: src/sbackup/core/profile_handler.py:245 #, python-format msgid "Number of new files (also included): %s." -msgstr "" +msgstr "新檔案數量 (加上已包含):%s。" -#: src/sbackup/core/profile_handler.py:242 +#: src/sbackup/core/profile_handler.py:246 #, python-format msgid "Number of files skipped in incremental snapshot: %s." -msgstr "" +msgstr "增量快照中被跳過的檔案數量:%s。" -#: src/sbackup/core/profile_handler.py:243 +#: src/sbackup/core/profile_handler.py:247 #, python-format msgid "Number of items forced to be excluded: %s." -msgstr "" +msgstr "強制排除的物件數量:%s。" -#: src/sbackup/core/profile_handler.py:244 +#: src/sbackup/core/profile_handler.py:248 #, python-format msgid "Number of items to be excluded by config: %s." -msgstr "" +msgstr "設定排除的物件數量:%s。" -#: src/sbackup/core/profile_handler.py:245 +#: src/sbackup/core/profile_handler.py:249 #, python-format msgid "Maximum free size required is '%s'." -msgstr "" +msgstr "所需最大可用空間為「%s」。" -#: src/sbackup/core/profile_handler.py:251 +#: src/sbackup/core/profile_handler.py:255 #, python-format msgid "Available disk size is '%s'." -msgstr "" +msgstr "可用磁碟空間為「%s」。" -#: src/sbackup/core/profile_handler.py:253 +#: src/sbackup/core/profile_handler.py:257 #, python-format msgid "" "Not enough free space in the target directory for the planned backup (free: " "%(freespace)s, required: %(neededspace)s)." -msgstr "" +msgstr "目標資料夾沒有足夠空間給計劃的備份 (可用:%(freespace)s,所需:%(neededspace)s)。" -#: src/sbackup/core/profile_handler.py:273 +#: src/sbackup/core/profile_handler.py:277 msgid "Unable to copy log. File access is not initialized." -msgstr "" +msgstr "無法複製日誌檔。檔案存取尚未初始化。" -#: src/sbackup/core/profile_handler.py:291 +#: src/sbackup/core/profile_handler.py:295 #, python-format msgid "Unable to copy log file: %s" -msgstr "" +msgstr "無法複製日誌檔:%s" -#: src/sbackup/core/profile_handler.py:293 +#: src/sbackup/core/profile_handler.py:297 msgid "Unable to find logfile to copy into snapshot." -msgstr "" +msgstr "無法找到要複製進快照的日誌檔案。" -#: src/sbackup/core/profile_handler.py:295 +#: src/sbackup/core/profile_handler.py:299 msgid "No snapshot to copy logfile." -msgstr "" +msgstr "沒有要複製日誌檔的快照。" -#: src/sbackup/core/profile_handler.py:302 +#: src/sbackup/core/profile_handler.py:306 msgid "Processing of profile was canceled on user request\n" -msgstr "" +msgstr "設定檔作業因使用者要求而被取消\n" -#: src/sbackup/core/profile_handler.py:319 +#: src/sbackup/core/profile_handler.py:323 msgid "Processing of profile successfully finished (no errors)\n" -msgstr "" +msgstr "設定檔作業成功完成 (沒有任何錯誤)\n" -#: src/sbackup/core/profile_handler.py:325 +#: src/sbackup/core/profile_handler.py:329 #, python-format msgid "Processing of profile failed with error: %s\n" -msgstr "" +msgstr "設定檔作業發生錯誤而失敗:%s\n" -#: src/sbackup/core/profile_handler.py:336 +#: src/sbackup/core/profile_handler.py:340 #, python-format msgid "Backup destination: %s" -msgstr "" +msgstr "備份目的地:%s" -#: src/sbackup/core/profile_handler.py:340 +#: src/sbackup/core/profile_handler.py:344 msgid "Unable to find destination directory." -msgstr "" +msgstr "無法找到目的資料夾。" -#: src/sbackup/core/profile_handler.py:359 +#: src/sbackup/core/profile_handler.py:363 msgid "Unable to find destination directory even after retry." -msgstr "" +msgstr "再次嘗試仍無法找到目的資料夾。" -#: src/sbackup/core/profile_handler.py:360 -#: src/sbackup/core/profile_handler.py:367 +#: src/sbackup/core/profile_handler.py:364 +#: src/sbackup/core/profile_handler.py:371 #, python-format msgid "Target directory '%(target)s' does not exist." -msgstr "" +msgstr "目標資料夾「%(target)s」不存在。" -#: src/sbackup/core/profile_handler.py:373 +#: src/sbackup/core/profile_handler.py:377 #, python-format msgid "Unable to access destination: %s" -msgstr "" +msgstr "無法存取目的地:%s" -#: src/sbackup/core/snapshot.py:132 +#: src/sbackup/core/snapshot.py:134 msgid "Snapshot is inconsistent: __name is not set " -msgstr "" +msgstr "快照不符合:__name 並未設置 " -#: src/sbackup/core/snapshot.py:143 +#: src/sbackup/core/snapshot.py:145 #, python-format msgid "Name of snapshot '%s' doesn't match requirement" -msgstr "" +msgstr "快照名稱「%s」和所要求條件不符合" -#: src/sbackup/core/snapshot.py:237 +#: src/sbackup/core/snapshot.py:239 msgid "Snapshot is inconsistent: __snapshotpath is not set " -msgstr "" +msgstr "快照不符合:__snapshotpath 並未設置 " -#: src/sbackup/core/snapshot.py:324 +#: src/sbackup/core/snapshot.py:318 #, python-format msgid "" "The snapshot compression format is supposed to be '%s' but the corresponding " "well named file wasn't found" -msgstr "" +msgstr "快照的壓縮格式應該為「%s」,但並未發現與此相應的命名檔案" -#: src/sbackup/core/snapshot.py:348 +#: src/sbackup/core/snapshot.py:342 #, python-format msgid "" "%(file)s doesn't contain valid value. Ignoring incomplete or non - backup " "directory. " -msgstr "" +msgstr "%(file)s 未包含有效的值。忽略不完整或不需備份的資料夾。 " -#: src/sbackup/core/snapshot.py:484 +#: src/sbackup/core/snapshot.py:478 #, python-format msgid "Name of Snapshot not valid : %s" -msgstr "" +msgstr "快照名稱無效:%s" -#: src/sbackup/core/snapshot.py:502 +#: src/sbackup/core/snapshot.py:496 #, python-format msgid "Name of base not valid : %s" -msgstr "" +msgstr "基底名稱無效:%s" -#: src/sbackup/core/snapshot.py:548 +#: src/sbackup/core/snapshot.py:542 #, python-format msgid "Invalid name of snapshot: %s" -msgstr "" +msgstr "無效的快照名稱:%s" -#: src/sbackup/core/snapshot.py:552 +#: src/sbackup/core/snapshot.py:546 msgid "Unable to read mandatory file `ver`" -msgstr "" +msgstr "無法讀取必要檔案「ver」" -#: src/sbackup/core/snapshot.py:597 +#: src/sbackup/core/snapshot.py:591 msgid "Base name must be set for incremental backup." -msgstr "" +msgstr "必須設定基底名稱才能進行增量備份。" #: src/sbackup/fs_backend/_fuse_fam.py:106 msgid "Initializing FUSE File Access Manager." -msgstr "" +msgstr "正在起始 FUSE 檔案存取管理員。" #: src/sbackup/fs_backend/_fuse_fam.py:129 msgid "Terminating FUSE File Access Manager." -msgstr "" +msgstr "正在終止 FUSE 檔案存取管理員。" -#: src/sbackup/fs_backend/_fuse_utils.py:44 -#: src/sbackup/fs_backend/_gio_utils.py:107 +#: src/sbackup/fs_backend/_fuse_utils.py:45 +#: src/sbackup/fs_backend/_gio_utils.py:109 msgid "SFTP" -msgstr "" +msgstr "SFTP" -#: src/sbackup/fs_backend/_fuse_utils.py:45 -#: src/sbackup/fs_backend/_gio_utils.py:108 +#: src/sbackup/fs_backend/_fuse_utils.py:46 +#: src/sbackup/fs_backend/_gio_utils.py:110 msgid "SSH" -msgstr "" +msgstr "SSH" -#: src/sbackup/fs_backend/_fuse_utils.py:46 -#: src/sbackup/fs_backend/_gio_utils.py:109 +#: src/sbackup/fs_backend/_fuse_utils.py:47 +#: src/sbackup/fs_backend/_gio_utils.py:111 msgid "FTP" -msgstr "" +msgstr "FTP" #: src/sbackup/fs_backend/_gio_fam.py:100 msgid "Initializing GIO File Access Manager." -msgstr "" +msgstr "正在起始 GIO 檔案存取管理員。" #: src/sbackup/fs_backend/_gio_fam.py:114 msgid "Terminating GIO File Access Manager." +msgstr "正在終止 GIO 檔案存取管理員。" + +#: src/sbackup/fs_backend/_gio_utils.py:95 +msgid "Unknown error code:" msgstr "" -#: src/sbackup/fs_backend/_gio_utils.py:110 +#: src/sbackup/fs_backend/_gio_utils.py:112 msgid "NFS" -msgstr "" +msgstr "NFS" -#: src/sbackup/fs_backend/_gio_utils.py:111 +#: src/sbackup/fs_backend/_gio_utils.py:113 msgid "SMB" -msgstr "" +msgstr "SMB" -#: src/sbackup/fs_backend/_gio_utils.py:191 +#: src/sbackup/fs_backend/_gio_utils.py:193 msgid "Unable to get mount: path is not mounted" -msgstr "" +msgstr "無法掛載:路徑尚未掛載" -#: src/sbackup/fs_backend/_gio_utils.py:193 +#: src/sbackup/fs_backend/_gio_utils.py:195 msgid "Unable to get mount: path not found when mounting (is probably local)" -msgstr "" +msgstr "無法掛載:掛載時未發現路徑 (可能為本地)" -#: src/sbackup/fs_backend/_gio_utils.py:195 -#: src/sbackup/fs_backend/_gio_utils.py:198 +#: src/sbackup/fs_backend/_gio_utils.py:197 +#: src/sbackup/fs_backend/_gio_utils.py:200 #, python-format msgid "Unable to get mount: %s" -msgstr "" +msgstr "無法掛載:%s" -#: src/sbackup/fs_backend/_gio_utils.py:248 +#: src/sbackup/fs_backend/_gio_utils.py:250 msgid "Unable to un-set mount flag: path is not stored" -msgstr "" +msgstr "無法取消設置掛載旗標:路徑未被存放" -#: src/sbackup/fs_backend/_gio_utils.py:350 +#: src/sbackup/fs_backend/_gio_utils.py:352 msgid "Path is already mounted." -msgstr "" +msgstr "路徑已被掛載。" -#: src/sbackup/fs_backend/_gio_utils.py:378 +#: src/sbackup/fs_backend/_gio_utils.py:380 msgid "Path is not mounted." -msgstr "" +msgstr "路徑尚未被掛載。" -#: src/sbackup/fs_backend/_gio_utils.py:846 +#: src/sbackup/fs_backend/_gio_utils.py:887 msgid "test specified path for existence using GIO" -msgstr "" +msgstr "使用 GIO 測試指定路徑是否存在" -#: src/sbackup/fs_backend/_gio_utils.py:859 +#: src/sbackup/fs_backend/_gio_utils.py:900 msgid "Create testdir" -msgstr "" +msgstr "建立測試資料夾" -#: src/sbackup/fs_backend/_gio_utils.py:864 +#: src/sbackup/fs_backend/_gio_utils.py:905 msgid "Test testfile for existence" -msgstr "" +msgstr "測試檔案是否存在" -#: src/sbackup/fs_backend/_gio_utils.py:871 +#: src/sbackup/fs_backend/_gio_utils.py:912 msgid "Create file" -msgstr "" +msgstr "建立檔案" -#: src/sbackup/fs_backend/_gio_utils.py:878 +#: src/sbackup/fs_backend/_gio_utils.py:919 msgid "Re-read test file" -msgstr "" +msgstr "重新讀取測試檔案" -#: src/sbackup/fs_backend/_gio_utils.py:890 +#: src/sbackup/fs_backend/_gio_utils.py:931 msgid "Remove file" -msgstr "" +msgstr "刪除檔案" -#: src/sbackup/fs_backend/_gio_utils.py:892 +#: src/sbackup/fs_backend/_gio_utils.py:933 msgid "Remove dir" -msgstr "" +msgstr "刪除資料夾" #: src/sbackup/fuse_plugins/__init__.py:160 #, python-format msgid "Unable to import plugin `%(plugin_name)s`: %(error_cause)s " -msgstr "" +msgstr "無法匯入附加元件「%(plugin_name)s」:%(error_cause)s " #: src/sbackup/fuse_plugins/ftpFuseFAM.py:117 #, python-format msgid "" "Couldn't found external application 'curlftpfs' needed for handling of ftp " "sites: %s" -msgstr "" +msgstr "無法找到處理 ftp 站台所需的外部程式「curlftpfs」:%s" #: src/sbackup/fuse_plugins/ftpFuseFAM.py:127 #: src/sbackup/fuse_plugins/sftpFuseFAM.py:124 #, python-format msgid "Couldn't mount '%(server)s' into '%(mountpoint)s' : %(error)s" -msgstr "" +msgstr "無法將「%(server)s」掛載至「%(mountpoint)s」:%(error)s" #: src/sbackup/fuse_plugins/ftpFuseFAM.py:141 msgid "FTP schema is: ftp://user:pass@server/anything" -msgstr "" +msgstr "FTP 範例如右:ftp://user:pass@server/anything" #: src/sbackup/fuse_plugins/ftpFuseFAM.py:188 #, python-format msgid "" "Error matching the schema 'ftp://user:pass@server/anything' with '%s' (The " "'/' after server is mandatory)" -msgstr "" +msgstr "「%s」和範例「ftp://user:pass@server/anything」配對錯誤 (伺服器網址後面必須有「/」存在)" #: src/sbackup/fuse_plugins/sftpFuseFAM.py:114 #, python-format msgid "" "Couldn't found external application 'curlftpfs' needed for handling of sftp " "sites: %s" -msgstr "" +msgstr "無法找到處理 sftp 站台所需的外部程式「curlftpfs」:%s" #: src/sbackup/fuse_plugins/sftpFuseFAM.py:138 msgid "SFTP schema is like : sftp://user:pass@server/anything" -msgstr "" +msgstr "SFTP 範例如右:sftp://user:pass@server/anything" #: src/sbackup/fuse_plugins/sftpFuseFAM.py:185 #, python-format msgid "" "Error matching the schema 'sftp://user:pass@server/anything' with '%s' (The " "'/' after server is mandatory)" -msgstr "" +msgstr "「%s」和範例「sftp://user:pass@server/anything」配對錯誤 (伺服器網址後面必須有「/」存在)" #: src/sbackup/fuse_plugins/sshFuseFAM.py:81 #, python-format msgid "" "Error matching the schema 'ssh://user:pass@example.com/home/' with '%s' (The " "'/' after server is mandatory)" -msgstr "" +msgstr "「%s」和範例「ssh://user:pass@example.com/home/」配對錯誤 (伺服器網址後面必須有「/」存在)" #: src/sbackup/fuse_plugins/sshFuseFAM.py:137 #, python-format msgid "" "The sshfs command '%(command)s' didn't perform normally. Output => " "%(erroroutput)s " -msgstr "" +msgstr "sshfs 指令「%(command)s」沒有正常運作。輸出 => %(erroroutput)s " #: src/sbackup/fuse_plugins/sshFuseFAM.py:142 msgid "SSH schema is like : ssh://user:pass@example.com:33/home/user/backup/" -msgstr "" +msgstr "SSH 範例如右:ssh://user:pass@example.com:33/home/user/backup/" #: src/sbackup/fuse_plugins/sshFuseFAM.py:158 #, python-format msgid "" "Error matching the schema 'ssh://user:pass@example.com:21/home/' with '%s' " "(The '/' after server is mandatory)" -msgstr "" +msgstr "「%s」和範例「ssh://user:pass@example.com:21/home/」配對錯誤 (伺服器網址後面必須有「/」存在)" #: src/sbackup/ui/GladeWindow.py:210 msgid "" "Please make sure the missing directory exists (e.g. by mounting an external " "disk) or change the specified target." -msgstr "" +msgstr "請確認遺失的路徑確實存在 (比如從外部硬碟掛載),或者將指定目標改成一個存在的路徑。" #: src/sbackup/ui/GladeWindow.py:211 #, python-format @@ -915,41 +868,43 @@ "\n" "%s." msgstr "" +"當存取備份目的地時發生下列錯誤:\n" +"\n" +"%s。" -#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:817 -#: src/sbackup/ui/restoregui.py:871 +#: src/sbackup/ui/GladeWindow.py:212 src/sbackup/ui/restoregui.py:797 msgid "Simple Backup error" -msgstr "" +msgstr "Simple Backup 錯誤" #: src/sbackup/ui/GladeWindow.py:213 msgid "Unable to access backup destination" -msgstr "" +msgstr "無法存取備份目的地" #: src/sbackup/ui/configgui.py:125 msgid "Scheduled backups are available for Administrator users only." -msgstr "" +msgstr "排程備份只供系統管理員使用。" #: src/sbackup/ui/configgui.py:135 src/sbackup/ui/configgui.py:144 msgid "Name" -msgstr "" +msgstr "名稱" #: src/sbackup/ui/configgui.py:152 msgid "File Type" -msgstr "" +msgstr "檔案類型" #: src/sbackup/ui/configgui.py:187 msgid "Enable" -msgstr "" +msgstr "啟用" #: src/sbackup/ui/configgui.py:188 msgid "Profile Name" -msgstr "" +msgstr "設定檔名稱" #: src/sbackup/ui/configgui.py:285 #, python-format msgid "" "Invalid or empty regular expression ('%s') found in configuration. Removed." -msgstr "" +msgstr "於設定檔中發現無效或空白的正規表達式(「%s」)。已移除。" #: src/sbackup/ui/configgui.py:292 #, python-format @@ -961,12 +916,18 @@ "These expressions are not used and were\n" "removed from the configuration." msgstr "" +"發現無效或空白的正規表達式\n" +"於設定檔:\n" +"「%s」\n" +"\n" +"這些表達式不會被使用,且\n" +"已從設定檔中移除。" #: src/sbackup/ui/configgui.py:548 msgid "" "Please make sure the missing directory exists (e.g. by mounting an external " "disk) or change the specified target to an existing one." -msgstr "" +msgstr "請確認遺失的路徑確實存在 (比如從外部硬碟掛載),或者將指定目標改成一個存在的路徑。" #: src/sbackup/ui/configgui.py:549 #, python-format @@ -976,10 +937,13 @@ "Attention: The target will be set to the default value. Check this on the " "destination settings page before saving the configuration." msgstr "" +"備份目標「%s」並不存在。\n" +"\n" +"注意:目標將設定為預設值。在儲存設定前,請在目的設定頁面點選預設選項。" #: src/sbackup/ui/configgui.py:551 msgid "Unable to open backup target" -msgstr "" +msgstr "無法開啟備份目標" #: src/sbackup/ui/configgui.py:623 #, python-format @@ -992,27 +956,32 @@ "\n" "Important note: Saving will overwrite your existing invalid configuration." msgstr "" +"%s\n" +"\n" +"一個使用預設值的備份設定檔已經建立。儲存新的設定以便使用,或者手動檢查您存在的設定檔。\n" +"\n" +"重要提醒:儲存將會覆寫您存在的無效設定。" #: src/sbackup/ui/configgui.py:641 #, python-format msgid "Current profile: %s" -msgstr "" +msgstr "目前設定檔:%s" #: src/sbackup/ui/configgui.py:732 msgid "Already included item !" -msgstr "" +msgstr "已經包含了此物件!" #: src/sbackup/ui/configgui.py:747 msgid "Already excluded item !" -msgstr "" +msgstr "已經排除了此物件!" #: src/sbackup/ui/configgui.py:759 src/sbackup/ui/configgui.py:1458 msgid "Empty expression. Please enter a valid regular expression." -msgstr "" +msgstr "空白的表達式。請輸入一個有效的正規表達式。" #: src/sbackup/ui/configgui.py:774 src/sbackup/ui/configgui.py:1472 msgid "Provided regular expression is not valid." -msgstr "" +msgstr "提供的正規表達式無效。" #: src/sbackup/ui/configgui.py:782 msgid "Empty filename or path. Please enter a valid filename or path." @@ -1022,11 +991,11 @@ msgid "" "It seems the path you entered does not exists. Do you want to add this " "incorrect path?" -msgstr "" +msgstr "您輸入的路徑並不存在。要將這個不正確的路經加入?" #: src/sbackup/ui/configgui.py:820 msgid "Save configuration as..." -msgstr "" +msgstr "儲存設定於..." #: src/sbackup/ui/configgui.py:887 msgid "" @@ -1035,20 +1004,23 @@ "You can monitor the progress of the backup by means of the status indicator " "displayed in the notification area." msgstr "" +"一個備份作業正於背景中執行。\n" +"\n" +"您可以從通知區顯示的進度指示器中觀察進度。" #: src/sbackup/ui/configgui.py:888 msgid "Backup process started" -msgstr "" +msgstr "備份作業開始" #: src/sbackup/ui/configgui.py:893 src/sbackup/ui/configgui.py:1661 #: src/sbackup/ui/configgui.py:2038 #, python-format msgid "Unexpected dialog response: %s" -msgstr "" +msgstr "未預期的對話回復:%s" #: src/sbackup/ui/configgui.py:967 msgid "Include file..." -msgstr "" +msgstr "包含檔案..." #: src/sbackup/ui/configgui.py:974 src/sbackup/ui/configgui.py:1029 msgid "All files" @@ -1056,99 +1028,99 @@ #: src/sbackup/ui/configgui.py:994 msgid "Include folder..." -msgstr "" +msgstr "包含資料夾..." #: src/sbackup/ui/configgui.py:1022 msgid "Exclude file..." -msgstr "" +msgstr "排除檔案..." #: src/sbackup/ui/configgui.py:1045 msgid "Exclude folder..." -msgstr "" +msgstr "排除資料夾..." #: src/sbackup/ui/configgui.py:1310 msgid "Configuration has changed" -msgstr "" +msgstr "設定已變更" #: src/sbackup/ui/configgui.py:1311 msgid "" "There are unsaved modifications. Please save the configuration or revert " "these changes before testing the mail settings." -msgstr "" +msgstr "有未被儲存的變更。請在測試郵件設定前儲存或回復所作的變更。" #: src/sbackup/ui/configgui.py:1317 src/sbackup/ui/configgui.py:1323 msgid "Test mail settings" -msgstr "" +msgstr "測試郵件設定" #: src/sbackup/ui/configgui.py:1318 msgid "The test failed with following output:" -msgstr "" +msgstr "測試失敗並傳回下列訊息:" #: src/sbackup/ui/configgui.py:1324 msgid "The test was successful." -msgstr "" +msgstr "測試成功。" #: src/sbackup/ui/configgui.py:1407 src/sbackup/ui/configgui.py:1450 #, python-format msgid "" "The given expression contains unsupported characters ('%s'). Currently it is " "not possible to use these characters in exclude expressions." -msgstr "" +msgstr "給予的表達式包含未支援的字元(「%s」)。目前沒辦法在排除表達式中使用這些字元。" #: src/sbackup/ui/configgui.py:1410 src/sbackup/ui/configgui.py:1453 msgid "Unsupported character" -msgstr "" +msgstr "未支援的字元" #: src/sbackup/ui/configgui.py:1621 msgid "Connect to remote destination" -msgstr "" +msgstr "連接至遠端目的地" #: src/sbackup/ui/configgui.py:1669 msgid "Mount was sucessful (no errors)" -msgstr "" +msgstr "掛載成功 (沒有任何錯誤)" #: src/sbackup/ui/configgui.py:1680 msgid "Unable to mount host" -msgstr "" +msgstr "無法掛載主機" #: src/sbackup/ui/configgui.py:1689 msgid "Umount was sucessful (no errors)" -msgstr "" +msgstr "卸載成功 (沒有任何錯誤)" #: src/sbackup/ui/configgui.py:1699 msgid "Unable to unmount host" -msgstr "" +msgstr "無法卸載主機" #: src/sbackup/ui/configgui.py:1729 msgid "Perfom tests on remote host" -msgstr "" +msgstr "開始對遠端主機的測試" #: src/sbackup/ui/configgui.py:1742 msgid "Unable to access remote destination" -msgstr "" +msgstr "無法存取遠端目的地" #: src/sbackup/ui/configgui.py:1746 msgid "All tests passed" -msgstr "" +msgstr "通過所有測試" #: src/sbackup/ui/configgui.py:1910 msgid "" "The given name of the new profile is empty. Please enter a valid profile " "name." -msgstr "" +msgstr "新設定檔的名稱是空的。請輸入一個有效的設定檔名。" #: src/sbackup/ui/configgui.py:1911 src/sbackup/ui/configgui.py:1918 msgid "Profile name not valid" -msgstr "" +msgstr "無效的設定檔名稱" #: src/sbackup/ui/configgui.py:1917 msgid "" "The given name of the new profile already exists. Please enter another name." -msgstr "" +msgstr "給予新設定檔的名稱已存在。請輸入另外一個名稱。" #: src/sbackup/ui/configgui.py:1919 msgid "Renaming of profiles is not supported." -msgstr "" +msgstr "不支援設定檔重新命名。" #: src/sbackup/ui/configgui.py:1949 #, python-format @@ -1161,6 +1133,11 @@ "\n" "Do you really want to delete the profile '%(name)s'?" msgstr "" +"刪除組態設定檔?\n" +"\n" +"您正嘗試要移除一個組態設定檔。您之後將無法回復它。不確定要這麼做的話,請改用「啟用|停用」功能。\n" +"\n" +"您真的要刪除設定檔「%(name)s」?" #: src/sbackup/ui/configgui.py:2022 #, python-format @@ -1172,10 +1149,14 @@ "These predefined settings are recommended for most users. Check whether they " "are appropriate for your use before saving the changed configuration." msgstr "" +"將目前的設定檔設回預設值?\n" +"這將用預設值覆蓋目前所編輯的設定檔:「%s」。\n" +"\n" +"這些預定義的設定值,建議多數使用者使用。在儲存設定變更前,請檢查這些設定是否符合您的需求。" #: src/sbackup/ui/configgui.py:2032 msgid "Default settings are being applied." -msgstr "" +msgstr "已採用預設值。" #: src/sbackup/ui/configgui.py:2057 msgid "" @@ -1184,6 +1165,9 @@ "The default profile cannot be removed. In the case you want to use just a " "single profile, please set up the default profile accordingly." msgstr "" +"無法移除預設設定檔\n" +"\n" +"預設設定檔無法被移除。若您只想使用一個設定檔,請將預設設定檔設定好。" #: src/sbackup/ui/configgui.py:2071 msgid "" @@ -1192,6 +1176,9 @@ "The default profile cannot be disabled. In the case you want to use just a " "single profile, please set up the default profile accordingly." msgstr "" +"無法移除預設設定檔\n" +"\n" +"預設設定檔無法被停用。若您只想使用一個設定檔,請將預設設定檔設定好。" #: src/sbackup/ui/configgui.py:2085 msgid "" @@ -1203,135 +1190,134 @@ "Please modify the settings according to your needs and save the " "configuration in order to use it." msgstr "" +"未發現任何備份設定檔\n" +"\n" +"沒有發現任何預設設定檔。這可能是因為您第一次執行 Simple Backup。已經建立一個使用預設值的設定檔。\n" +"\n" +"請依您的需求來調整設定並儲存以便使用。" #: src/sbackup/ui/configgui.py:2098 msgid "Please select a profile." -msgstr "" +msgstr "請選擇一個設定檔。" #: src/sbackup/ui/indicator_core.py:117 msgid "there was a problem initializing the pynotify module" -msgstr "" +msgstr "在初始 pynotify 模組時發生問題" -#: src/sbackup/ui/indicator_core.py:146 src/sbackup/ui/indicator_core.py:193 -#: src/sbackup/ui/indicator_core.py:221 src/sbackup/ui/indicator_core.py:243 +#: src/sbackup/ui/indicator_core.py:148 src/sbackup/ui/indicator_core.py:197 +#: src/sbackup/ui/indicator_core.py:225 src/sbackup/ui/indicator_core.py:247 #, python-format msgid "Connection to notification-daemon failed: %s" -msgstr "" +msgstr "和 notification-daemon 的連接失敗:%s" -#: src/sbackup/ui/indicator_core.py:306 +#: src/sbackup/ui/indicator_core.py:310 msgid "Simple Backup" -msgstr "" +msgstr "Simple Backup" -#: src/sbackup/ui/indicator_core.py:312 +#: src/sbackup/ui/indicator_core.py:316 msgid "Show message windows" -msgstr "" +msgstr "顯示訊息視窗" -#: src/sbackup/ui/indicator_core.py:354 src/sbackup/ui/indicator_core.py:814 +#: src/sbackup/ui/indicator_core.py:358 src/sbackup/ui/indicator_core.py:816 msgid "Cancel Backup" -msgstr "" +msgstr "取消備份" -#: src/sbackup/ui/indicator_core.py:416 +#: src/sbackup/ui/indicator_core.py:420 msgid "Connection to D-Bus service lost." -msgstr "" +msgstr "遺失和 D-Bus 服務的連接。" -#: src/sbackup/ui/indicator_core.py:441 +#: src/sbackup/ui/indicator_core.py:445 msgid "re-connection was successful" -msgstr "" +msgstr "重新連接成功" -#: src/sbackup/ui/indicator_core.py:480 +#: src/sbackup/ui/indicator_core.py:484 msgid "" "No backup in progress and connection to D-Bus service lost. Simple Backup " "Indicator is being terminated." -msgstr "" +msgstr "沒有備份作業正在執行,並遺失和 D-Bus 服務的連接。Simple Backup 指示器已被中止。" -#: src/sbackup/ui/indicator_core.py:509 +#: src/sbackup/ui/indicator_core.py:513 msgid "Starting backup session" -msgstr "" +msgstr "備份作業開始" -#: src/sbackup/ui/indicator_core.py:523 +#: src/sbackup/ui/indicator_core.py:527 msgid "Ending Backup Session" -msgstr "" - -#: src/sbackup/ui/indicator_core.py:536 -msgid "" -"There are snapshots with old snapshot format. Please upgrade these using the " -"Restoration tool if you want to use them." -msgstr "" +msgstr "備份作業結束" -#: src/sbackup/ui/indicator_core.py:538 +#: src/sbackup/ui/indicator_core.py:540 #, python-format msgid "Unknown D-Bus event `%s` received." -msgstr "" +msgstr "收到未知的 D-Bus 事件「%s」。" -#: src/sbackup/ui/indicator_core.py:579 +#: src/sbackup/ui/indicator_core.py:581 msgid "Try again" -msgstr "" +msgstr "再試一次" -#: src/sbackup/ui/indicator_core.py:649 +#: src/sbackup/ui/indicator_core.py:651 msgid "" "Attempt of starting another instance of Simple Backup while this one is " "already running." -msgstr "" +msgstr "嘗試在 Simple Backup 執行時開啟另外一個實體。" -#: src/sbackup/ui/indicator_core.py:659 +#: src/sbackup/ui/indicator_core.py:661 #, python-format msgid "Unable to present window: %s" -msgstr "" +msgstr "無法顯示視窗:%s" -#: src/sbackup/ui/indicator_core.py:675 +#: src/sbackup/ui/indicator_core.py:677 #, python-format msgid "Do you really want to cancel the backup process of profile '%s'?" -msgstr "" +msgstr "您真的要取消設定檔「%s」的備份作業?" -#: src/sbackup/ui/indicator_core.py:679 +#: src/sbackup/ui/indicator_core.py:681 msgid "Cancel running backup process?" -msgstr "" +msgstr "取消進行中的備份作業?" -#: src/sbackup/ui/indicator_core.py:696 +#: src/sbackup/ui/indicator_core.py:698 msgid "Unable to cancel backup process." -msgstr "" +msgstr "無法取消備份作業。" -#: src/sbackup/ui/indicator_core.py:758 +#: src/sbackup/ui/indicator_core.py:760 #, python-format msgid "Profile: %s" -msgstr "" +msgstr "設定檔:%s" -#: src/sbackup/ui/indicator_core.py:759 +#: src/sbackup/ui/indicator_core.py:761 #, python-format msgid "Size of backup: %s" -msgstr "" +msgstr "備份檔大小:%s" -#: src/sbackup/ui/indicator_core.py:760 +#: src/sbackup/ui/indicator_core.py:762 #, python-format msgid "%.1f%% processed" -msgstr "" +msgstr "%.1f%% 已完成" -#: src/sbackup/ui/indicator_core.py:761 +#: src/sbackup/ui/indicator_core.py:763 #, python-format msgid "Remaining time: %s" -msgstr "" +msgstr "剩餘時間:%s" -#: src/sbackup/ui/indicator_core.py:807 +#: src/sbackup/ui/indicator_core.py:809 #, python-format msgid "PID of backup process being canceled: %s" -msgstr "" +msgstr "備份作業的 PID 被取消: %s" -#: src/sbackup/ui/indicator_core.py:812 +#: src/sbackup/ui/indicator_core.py:814 #, python-format msgid "Unable to send signal to process %s" -msgstr "" +msgstr "無法傳送訊息至作業 %s" -#: src/sbackup/ui/indicator_core.py:813 +#: src/sbackup/ui/indicator_core.py:815 #, python-format msgid "Sending signal using gksu to process %s" -msgstr "" +msgstr "使用 gksu 傳送訊息至作業 %s" -#: src/sbackup/ui/indicator_core.py:817 +#: src/sbackup/ui/indicator_core.py:819 #, python-format msgid "Sending signal using gksu to process %s failed" -msgstr "" +msgstr "使用 gksu 傳送訊息至作業 %s 失敗" -#: src/sbackup/ui/indicator_core.py:852 +#: src/sbackup/ui/indicator_core.py:854 #, python-format msgid "" "Unable to find specified target directory\n" @@ -1339,86 +1325,90 @@ "The specified target directory '%s' was not found.\n" "\n" msgstr "" +"無法找到指定的目標資料夾\n" +"\n" +"未發現指定的目標資料夾「%s」。\n" +"\n" -#: src/sbackup/ui/indicator_core.py:853 +#: src/sbackup/ui/indicator_core.py:855 #, python-format msgid "" "You can try to use the specified target again or cancel the profile " "execution. The specified destination is automatically used in %s seconds." -msgstr "" +msgstr "您可以再次嘗試使用指定的目標,或是取消設定檔的執行。該指定目的地在 %s 秒前被自動使用過。" -#: src/sbackup/ui/indicator_core.py:880 src/sbackup/ui/indicator_core.py:922 -#: src/sbackup/ui/indicator_core.py:940 src/sbackup/ui/indicator_core.py:948 -#: src/sbackup/ui/indicator_core.py:965 +#: src/sbackup/ui/indicator_core.py:882 src/sbackup/ui/indicator_core.py:924 +#: src/sbackup/ui/indicator_core.py:942 src/sbackup/ui/indicator_core.py:950 +#: src/sbackup/ui/indicator_core.py:967 msgid "unknown" -msgstr "" +msgstr "未知" -#: src/sbackup/ui/indicator_core.py:901 +#: src/sbackup/ui/indicator_core.py:903 msgid "less than 1 minute" -msgstr "" +msgstr "不超過 1 分鐘" -#: src/sbackup/ui/indicator_core.py:903 +#: src/sbackup/ui/indicator_core.py:905 msgid "about 2 minutes" -msgstr "" +msgstr "大約 2 分鐘" -#: src/sbackup/ui/indicator_core.py:905 +#: src/sbackup/ui/indicator_core.py:907 msgid "about 3 minutes" -msgstr "" +msgstr "大約 3 分鐘" -#: src/sbackup/ui/indicator_core.py:907 +#: src/sbackup/ui/indicator_core.py:909 msgid "about 4 minutes" -msgstr "" +msgstr "大約 4 分鐘" -#: src/sbackup/ui/indicator_core.py:909 +#: src/sbackup/ui/indicator_core.py:911 msgid "about 5 minutes" -msgstr "" +msgstr "大約 5 分鐘" -#: src/sbackup/ui/indicator_core.py:911 +#: src/sbackup/ui/indicator_core.py:913 #, python-format msgid "about %.0f minutes" -msgstr "" +msgstr "大約 %.0f 分鐘" -#: src/sbackup/ui/indicator_core.py:921 +#: src/sbackup/ui/indicator_core.py:923 msgid "In progress" -msgstr "" +msgstr "進行中" -#: src/sbackup/ui/indicator_core.py:931 src/sbackup/ui/indicator_core.py:957 +#: src/sbackup/ui/indicator_core.py:933 src/sbackup/ui/indicator_core.py:959 msgid "finished" -msgstr "" +msgstr "完成" -#: src/sbackup/ui/indicator_core.py:939 +#: src/sbackup/ui/indicator_core.py:941 msgid "Progress: unknown" -msgstr "" +msgstr "進程:未知" -#: src/sbackup/ui/indicator_core.py:946 +#: src/sbackup/ui/indicator_core.py:948 msgid "Backup is being prepared" -msgstr "" +msgstr "備份準備中" -#: src/sbackup/ui/indicator_core.py:947 +#: src/sbackup/ui/indicator_core.py:949 msgid "Collecting file info" -msgstr "" +msgstr "收集資料中" -#: src/sbackup/ui/indicator_core.py:956 +#: src/sbackup/ui/indicator_core.py:958 msgid "Progress: canceled" -msgstr "" +msgstr "進程:取消" -#: src/sbackup/ui/indicator_core.py:978 +#: src/sbackup/ui/indicator_core.py:980 msgid "An error occurred" -msgstr "" +msgstr "發生錯誤" -#: src/sbackup/ui/indicator_core.py:1011 +#: src/sbackup/ui/indicator_core.py:1013 msgid "Another `Simple Backup Indicator` is already running." -msgstr "" +msgstr "另一個「Simple Backup 指示器」已經在執行當中。" -#: src/sbackup/ui/indicator_core.py:1035 +#: src/sbackup/ui/indicator_core.py:1037 #, python-format msgid "Initialization of GTK+ failed: %s" -msgstr "" +msgstr "GTK+ 初始化失敗:%s" #: src/sbackup/ui/misc.py:294 #, python-format msgid "%s (Administrator mode)" -msgstr "" +msgstr "%s (系統管理員模式)" #: src/sbackup/ui/misc.py:324 #, python-format @@ -1430,39 +1420,44 @@ "\n" "%s" msgstr "" +"發生不預期的錯誤。關閉這個訊息窗並重啟本程式。\n" +"\n" +"請至 https://bugs.launchpad.net/sbackup 回報該錯誤。\n" +"\n" +"%s" #: src/sbackup/ui/misc.py:325 msgid "Sorry, this should not have happened" -msgstr "" +msgstr "抱歉,這本來不應該發生的" #: src/sbackup/ui/restoregui.py:78 msgid "Restore..." -msgstr "" +msgstr "還原..." -#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:845 +#: src/sbackup/ui/restoregui.py:79 data/ui/sbackup-restore.glade:765 msgid "Restore as..." -msgstr "" +msgstr "還原至..." #: src/sbackup/ui/restoregui.py:80 msgid "Revert..." -msgstr "" +msgstr "回溯..." -#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:877 +#: src/sbackup/ui/restoregui.py:81 data/ui/sbackup-restore.glade:797 msgid "Revert as..." -msgstr "" +msgstr "回溯至..." #: src/sbackup/ui/restoregui.py:128 data/ui/sbackup-restore.glade:111 -#: data/ui/sbackup-restore.glade:591 +#: data/ui/sbackup-restore.glade:511 msgid "n.a." -msgstr "" +msgstr "不適用" #: src/sbackup/ui/restoregui.py:146 src/sbackup/ui/restoregui.py:163 msgid "Snapshots" -msgstr "" +msgstr "快照" #: src/sbackup/ui/restoregui.py:147 msgid "Version" -msgstr "" +msgstr "版本" #: src/sbackup/ui/restoregui.py:154 data/ui/sbackup-config.glade:4063 msgid "Path" @@ -1470,23 +1465,23 @@ #: src/sbackup/ui/restoregui.py:159 msgid "State" -msgstr "" +msgstr "狀態" #: src/sbackup/ui/restoregui.py:187 msgid "Connect to destination..." -msgstr "" +msgstr "連接至目的地..." #: src/sbackup/ui/restoregui.py:211 msgid "Specified path does not exist" -msgstr "" +msgstr "指定的目錄不存在" #: src/sbackup/ui/restoregui.py:257 msgid "Ready" -msgstr "" +msgstr "就緒" #: src/sbackup/ui/restoregui.py:371 msgid "No destination specified" -msgstr "" +msgstr "未指定任何目的地" #: src/sbackup/ui/restoregui.py:388 msgid "Choose a source folder" @@ -1494,45 +1489,45 @@ #: src/sbackup/ui/restoregui.py:405 msgid "Reading snapshots..." -msgstr "" +msgstr "讀取快照..." #: src/sbackup/ui/restoregui.py:428 msgid "Reading directory content..." -msgstr "" +msgstr "讀取資料夾內容..." #: src/sbackup/ui/restoregui.py:458 src/sbackup/ui/restoregui.py:496 msgid "Loading ..." -msgstr "載入中" +msgstr "載入中 ..." #: src/sbackup/ui/restoregui.py:539 msgid "Reading files from snapshot..." -msgstr "" +msgstr "讀取快照內的檔案..." #: src/sbackup/ui/restoregui.py:552 msgid "Simple Backup restore error" -msgstr "" +msgstr "Simple Backup 復原錯誤" #: src/sbackup/ui/restoregui.py:553 msgid "An error occurred while reading snapshot" -msgstr "" +msgstr "讀取快照時發生錯誤" #: src/sbackup/ui/restoregui.py:557 msgid "This snapshot seems empty." -msgstr "" +msgstr "這個快照是空的。" #: src/sbackup/ui/restoregui.py:576 msgid "Reading backup snapshot..." -msgstr "" +msgstr "讀取備份快照..." #: src/sbackup/ui/restoregui.py:599 msgid "No backups found for this day." -msgstr "" +msgstr "未發現任何該天的備份。" -#: src/sbackup/ui/restoregui.py:614 +#: src/sbackup/ui/restoregui.py:614 src/sbackup/ui/restoregui.py:771 #, python-format msgid "" "Snapshot version is not supported (Only %(supportedversion)s is supported). " -"Version '%(currentversion)s' found. You should upgrade it. " +"Version '%(currentversion)s' found." msgstr "" #: src/sbackup/ui/restoregui.py:643 @@ -1542,74 +1537,22 @@ #: src/sbackup/ui/restoregui.py:662 #, python-format msgid "Do you really want to revert '%s'?" -msgstr "" +msgstr "您真的要回溯「%s」?" #: src/sbackup/ui/restoregui.py:676 msgid "Select revert location" -msgstr "" +msgstr "選擇回溯位置" #: src/sbackup/ui/restoregui.py:685 #, python-format msgid "Do you really want to revert '%(source)s' to '%(dir)s'?" -msgstr "" +msgstr "您真的要回溯「%(source)s」至「%(dir)s」?" #: src/sbackup/ui/restoregui.py:763 msgid "Reading snapshot..." -msgstr "" +msgstr "讀取快照中..." #: src/sbackup/ui/restoregui.py:782 -msgid "The version of the snapshot is greater than the supported one!" -msgstr "" - -#: src/sbackup/ui/restoregui.py:792 -#, python-format -msgid "" -"Upgrading the selected snapshot `%s` might corrupt your backup for this " -"particular point in time. You cannot undo this operation. It is recommended " -"to create a copy of the snapshot directory before upgrading it. The upgrade " -"process takes a while - be patient.\n" -"\n" -"Are you sure that you want to upgrade the snapshot now?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:796 -msgid "Do you really want to upgrade snapshot?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:800 -#, python-format -msgid "Upgrade snapshot '%s'" -msgstr "" - -#: src/sbackup/ui/restoregui.py:809 -msgid "Snapshot was sucessfully upgraded." -msgstr "" - -#: src/sbackup/ui/restoregui.py:810 -msgid "Simple Backup upgrade" -msgstr "" - -#: src/sbackup/ui/restoregui.py:811 -msgid "Upgrade finished" -msgstr "" - -#: src/sbackup/ui/restoregui.py:814 -#, python-format -msgid "" -"While attempting to upgrade snapshot the following error occurred:\n" -"%s" -msgstr "" - -#: src/sbackup/ui/restoregui.py:817 -msgid "Unable to upgrade snapshot" -msgstr "" - -#: src/sbackup/ui/restoregui.py:838 -#, python-format -msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" -msgstr "" - -#: src/sbackup/ui/restoregui.py:856 #, python-format msgid "" "Deleting the selected snapshot `%s` will remove your backup for this " @@ -1617,23 +1560,28 @@ "\n" "Are you sure that you want to remove the snapshot permanently?" msgstr "" +"刪除選擇的快照「%s」將會移除您在這一時間所備份的資料。您無法復原這個動作。\n" +"\n" +"您確定要永遠刪除這個快照?" -#: src/sbackup/ui/restoregui.py:860 +#: src/sbackup/ui/restoregui.py:786 msgid "Do you really want to remove snapshot?" -msgstr "" +msgstr "您真的要刪除快照嗎?" -#: src/sbackup/ui/restoregui.py:869 +#: src/sbackup/ui/restoregui.py:795 #, python-format msgid "" "While attempting to delete snapshot the following error occurred:\n" "%s" msgstr "" +"當嘗試刪除快照時發生下列錯誤:\n" +"%s" -#: src/sbackup/ui/restoregui.py:872 +#: src/sbackup/ui/restoregui.py:798 msgid "Unable to delete snapshot" -msgstr "" +msgstr "無法刪除快照" -#: src/sbackup/ui/restoregui.py:878 +#: src/sbackup/ui/restoregui.py:804 #, python-format msgid "" "The selected snapshot '%s' is referenced by more recent snapshots as base " @@ -1641,58 +1589,68 @@ "\n" "Remove all of these child snapshots in order to delete this snapshot." msgstr "" +"選擇的快照「%s」已被更新的快照作為參考用的母快照。\n" +"\n" +"此快照必須先移除其所有子快照之後才能刪除。" -#: src/sbackup/ui/restoregui.py:880 +#: src/sbackup/ui/restoregui.py:806 msgid "Unable to remove snapshot" -msgstr "" +msgstr "無法移除快照" -#: src/sbackup/ui/restoregui.py:888 +#: src/sbackup/ui/restoregui.py:814 msgid "Termination in progress" -msgstr "" +msgstr "作業中斷" -#: src/sbackup/ui/restoregui.py:904 src/sbackup/ui/restoregui.py:910 -#: src/sbackup/ui/restoregui.py:916 src/sbackup/ui/restoregui.py:922 -#: data/ui/sbackup-restore.glade:1039 +#: src/sbackup/ui/restoregui.py:830 src/sbackup/ui/restoregui.py:836 +#: src/sbackup/ui/restoregui.py:842 src/sbackup/ui/restoregui.py:848 +#: data/ui/sbackup-restore.glade:959 msgid "Simple Backup restoration" -msgstr "" +msgstr "Simple Backup 還原" -#: src/sbackup/ui/restoregui.py:905 src/sbackup/ui/restoregui.py:911 +#: src/sbackup/ui/restoregui.py:831 src/sbackup/ui/restoregui.py:837 msgid "Restoring of selected files" -msgstr "" +msgstr "還原所選擇的檔案" -#: src/sbackup/ui/restoregui.py:906 +#: src/sbackup/ui/restoregui.py:832 #, python-format msgid "Restoring of '%s' is in progress." -msgstr "" +msgstr "正在進行「%s」的還原。" -#: src/sbackup/ui/restoregui.py:907 +#: src/sbackup/ui/restoregui.py:833 #, python-format msgid "Restoring of '%s' was successful." -msgstr "" +msgstr "「%s」的還原成功。" -#: src/sbackup/ui/restoregui.py:908 +#: src/sbackup/ui/restoregui.py:834 #, python-format msgid "" "Restoring of '%s' was not successful.\n" "\n" "Following error occurred:\n" msgstr "" +"「%s」的還原沒有成功。\n" +"\n" +"發生下列錯誤:\n" -#: src/sbackup/ui/restoregui.py:912 +#: src/sbackup/ui/restoregui.py:838 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" +"正在進行「%(source)s」\n" +"至「%(dirname)s」的還原。" -#: src/sbackup/ui/restoregui.py:913 +#: src/sbackup/ui/restoregui.py:839 #, python-format msgid "" "Restoring of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" +"「%(source)s」\n" +"至「%(dirname)s」的還原成功。" -#: src/sbackup/ui/restoregui.py:914 +#: src/sbackup/ui/restoregui.py:840 #, python-format msgid "" "Restoring of '%(source)s'\n" @@ -1700,44 +1658,55 @@ "\n" "Following error occurred:\n" msgstr "" +"「%(source)s」\n" +"至「%(dirname)s」的還原沒有成功。\n" +"\n" +"發生下列錯誤:\n" -#: src/sbackup/ui/restoregui.py:917 src/sbackup/ui/restoregui.py:923 +#: src/sbackup/ui/restoregui.py:843 src/sbackup/ui/restoregui.py:849 msgid "Reverting selected files" -msgstr "" +msgstr "回溯所選擇的檔案" -#: src/sbackup/ui/restoregui.py:918 +#: src/sbackup/ui/restoregui.py:844 #, python-format msgid "Reverting of '%s' is in progress.\n" -msgstr "" +msgstr "正在進行「%s」的回溯。\n" -#: src/sbackup/ui/restoregui.py:919 +#: src/sbackup/ui/restoregui.py:845 #, python-format msgid "Reverting of '%s' was successful." -msgstr "" +msgstr "「%s」的回溯成功。" -#: src/sbackup/ui/restoregui.py:920 +#: src/sbackup/ui/restoregui.py:846 #, python-format msgid "" "Reverting of '%s' was not successful.\n" "\n" "Following error occurred:\n" msgstr "" +"「%s」的回溯沒有成功。\n" +"\n" +"發生下列錯誤:\n" -#: src/sbackup/ui/restoregui.py:924 +#: src/sbackup/ui/restoregui.py:850 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' is in progress." msgstr "" +"正在進行「%(source)s」\n" +"至「%(dirname)s」的回溯。" -#: src/sbackup/ui/restoregui.py:925 +#: src/sbackup/ui/restoregui.py:851 #, python-format msgid "" "Reverting of '%(source)s'\n" "to '%(dirname)s' was successful." msgstr "" +"「%(source)s」\n" +"至「%(dirname)s」的回溯成功。" -#: src/sbackup/ui/restoregui.py:926 +#: src/sbackup/ui/restoregui.py:852 #, python-format msgid "" "Reverting of '%(source)s'\n" @@ -1745,151 +1714,152 @@ "\n" "Following error occurred:\n" msgstr "" +"「%(source)s」\n" +"至「%(dirname)s」的回溯沒有成功。\n" +"\n" +"發生下列錯誤:\n" #: src/sbackup/util/__init__.py:439 #, python-format msgid "%(mb)d MiB %(kb)d KiB" -msgstr "" +msgstr "%(mb)d MiB %(kb)d KiB" #: src/sbackup/util/__init__.py:442 #, python-format msgid "%(mb)d MiB %(kb)d KiB %(bytes)d" -msgstr "" +msgstr "%(mb)d MiB %(kb)d KiB %(bytes)d" #: src/sbackup/util/__init__.py:447 #, python-format msgid "%(mb)d MB %(kb)d kB" -msgstr "" +msgstr "%(mb)d MB %(kb)d kB" #: src/sbackup/util/__init__.py:450 #, python-format msgid "%(mb)d MB %(kb)d kB %(bytes)d" -msgstr "" +msgstr "%(mb)d MB %(kb)d kB %(bytes)d" #: src/sbackup/util/filecollect.py:335 #, python-format -msgid "File '%(file)s' does not exist." -msgstr "" - -#: src/sbackup/util/filecollect.py:348 -#, python-format msgid "File '%(file)s' is not accessable with error '%(error)s'." -msgstr "" +msgstr "檔案「%(file)s」無法被存取,錯誤訊息「%(error)s」。" -#: src/sbackup/util/filecollect.py:364 +#: src/sbackup/util/filecollect.py:351 #, python-format msgid "" "File '%(file)s' cannot be opened for read access. Operation timed out." -msgstr "" +msgstr "檔案「%(file)s」無法以讀取權限開啟。操作時間已逾時。" -#: src/sbackup/util/filecollect.py:368 +#: src/sbackup/util/filecollect.py:355 #, python-format msgid "" "File '%(file)s' cannot be opened for read access with error '%(error)s'." -msgstr "" +msgstr "檔案「%(file)s」無法以讀取權限開啟,錯誤訊息「%(error)s」。" -#: src/sbackup/util/filecollect.py:385 +#: src/sbackup/util/filecollect.py:372 #, python-format -msgid "File '%(file)s' is backup's target directory." -msgstr "" +msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." +msgstr "軟連結「%(path)s」->「%(ln_target)s」是循環軟連結。" -#: src/sbackup/util/filecollect.py:394 +#: src/sbackup/util/filecollect.py:388 #, python-format -msgid "Symbolic link '%(path)s' -> '%(ln_target)s' is a circular symlink." -msgstr "" +msgid "File '%(file)s' is backup's target directory." +msgstr "檔案「%(file)s」是備份的目標資料夾。" -#: src/sbackup/util/filecollect.py:414 +#: src/sbackup/util/filecollect.py:393 #, python-format -msgid "" -"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." -msgstr "" +msgid "Path '%(file)s' defined in excludes list." +msgstr "路徑「%(file)s」已定義於排除列表中。" -#: src/sbackup/util/filecollect.py:424 +#: src/sbackup/util/filecollect.py:401 #, python-format msgid "File '%(file)s' matches regular expression '%(regex)s'." -msgstr "" +msgstr "檔案「%(file)s」符合正規表達式「%(regex)s」。" -#: src/sbackup/util/filecollect.py:430 +#: src/sbackup/util/filecollect.py:419 #, python-format -msgid "Path '%(file)s' defined in excludes list." -msgstr "" +msgid "" +"File '%(file)s' exceeds maximum file size ( %(filesize)s > %(maxsize)s)." +msgstr "檔案「%(file)s」超過檔案大小設限值 (%(filesize)s > %(maxsize)s)。" -#: src/sbackup/util/filecollect.py:501 +#: src/sbackup/util/filecollect.py:497 #, python-format msgid "Error while checking directory '%(dir)s': %(error)s." -msgstr "" +msgstr "在檢查目錄「%(dir)s」時發生錯誤:%(error)s。" -#: src/sbackup/util/filecollect.py:552 +#: src/sbackup/util/filecollect.py:548 msgid "Empty regular expression found. Skipped." -msgstr "" +msgstr "發現空白的正規表達式。已跳過。" -#: src/sbackup/util/filecollect.py:558 +#: src/sbackup/util/filecollect.py:554 #, python-format msgid "Invalid regular expression ('%s') found. Skipped." -msgstr "" +msgstr "發現無效的正規表達式(「%s」)。已跳過。" -#: src/sbackup/util/filecollect.py:577 +#: src/sbackup/util/filecollect.py:573 msgid "No directories to backup defined." -msgstr "" +msgstr "沒有定義要備份的資料夾。" #: src/sbackup/util/lock.py:76 msgid "Another application instance is already running." -msgstr "" +msgstr "有另外一個程式正在運行。" #: src/sbackup/util/lock.py:78 msgid "Invalid lock file found. Is being removed." -msgstr "" +msgstr "發現無效的鎖定檔。檔案已移除。" #: src/sbackup/util/lock.py:128 src/sbackup/util/lock.py:142 #, python-format msgid "Unable to remove lock file: %s" -msgstr "" +msgstr "無法找到鎖定檔:%s" #: src/sbackup/util/lock.py:132 src/sbackup/util/lock.py:144 msgid "Unable to remove lock file: File not found." -msgstr "" +msgstr "無法找到鎖定檔:檔案未發現。" #: data/ui/sbackup-config.glade:11 msgid "Exclude file type" -msgstr "" +msgstr "排除檔案類型" #: data/ui/sbackup-config.glade:26 msgid "Standard file types:" -msgstr "" +msgstr "常見檔案類型:" #: data/ui/sbackup-config.glade:63 msgid "Custom defined file type with " -msgstr "" +msgstr "自定義檔案類型為 " #: data/ui/sbackup-config.glade:93 msgid "file extension" -msgstr "" +msgstr "副檔名" #: data/ui/sbackup-config.glade:163 msgid "Exclude by regex" -msgstr "" +msgstr "從正規表示法排除" #: data/ui/sbackup-config.glade:180 msgid "" "Enter a regular expression.\n" "Files and directories matching this expression will be excluded from backup." msgstr "" +"輸入一條正規表達式。\n" +"凡是符合表達式的檔案和資料夾將會從備份排除。" #: data/ui/sbackup-config.glade:257 msgid "Enter the remote target to include" -msgstr "" +msgstr "輸入要包括的遠端目標" #: data/ui/sbackup-config.glade:278 msgid "Choose a plugin to get the format" -msgstr "" +msgstr "選擇一個附加元件以取得格式" #: data/ui/sbackup-config.glade:295 msgid "Choose your plugin :" -msgstr "" +msgstr "選擇您的附加元件:" #: data/ui/sbackup-config.glade:367 msgid "Check" -msgstr "" +msgstr "檢查" #: data/ui/sbackup-config.glade:479 msgid "" @@ -1900,21 +1870,26 @@ "\n" "Do you want to save the configuration now?" msgstr "" +"儲存變更的設定?\n" +"\n" +"設定已被變更。若您想要使用調整過的設定,您必須先儲存它。\n" +"\n" +"您要現在儲存設定嗎?" #: data/ui/sbackup-config.glade:572 msgid "Configuration Profile Manager" -msgstr "" +msgstr "組態設定檔管理員" #: data/ui/sbackup-config.glade:594 msgid "" "You can set up multiple configuration profiles which are processed when " "performing a backup. Each profile has its own set of settings including " "backup destination, backup format etc." -msgstr "" +msgstr "您可以設置多個組態設定檔,它們將在進行備份時執行。每個設定檔都有自己的一套設定組,包含備份目的地、備份格式等等。" #: data/ui/sbackup-config.glade:613 msgid "Configuration profiles" -msgstr "" +msgstr "組態設定檔" #: data/ui/sbackup-config.glade:785 msgid "" @@ -1923,74 +1898,77 @@ "Please enter the new profile name and set the according checkbox in order to " "enable resp. disable it." msgstr "" +"加入新的設定檔\n" +"\n" +"請輸入新設定檔所用的名稱,並用下方的勾選框來決定要啟用還是停用它。" #: data/ui/sbackup-config.glade:810 msgid "Profile name" -msgstr "" +msgstr "設定檔名稱" #: data/ui/sbackup-config.glade:836 msgid "Enabled" -msgstr "" +msgstr "啟用" #: data/ui/sbackup-config.glade:915 data/ui/sbackup-restore.glade:7 msgid "Simple Backup Suite" -msgstr "" +msgstr "Simple Backup Suite" #: data/ui/sbackup-config.glade:932 msgid "_File" -msgstr "" +msgstr "檔案(_F)" #: data/ui/sbackup-config.glade:971 msgid "Save as..." -msgstr "" +msgstr "儲存至..." #: data/ui/sbackup-config.glade:1008 msgid "_Tools" -msgstr "" +msgstr "工具(_T)" #: data/ui/sbackup-config.glade:1016 data/ui/sbackup-config.glade:1140 msgid "Set default settings..." -msgstr "" +msgstr "設回預設設定..." #: data/ui/sbackup-config.glade:1037 msgid "Profile Manager..." -msgstr "" +msgstr "設定檔管理員..." #: data/ui/sbackup-config.glade:1058 msgid "Make backup now" -msgstr "" +msgstr "現在就建立備份" #: data/ui/sbackup-config.glade:1079 msgid "_Help" -msgstr "" +msgstr "幫助(_H)" #: data/ui/sbackup-config.glade:1087 msgid "_View all help topics" -msgstr "" +msgstr "查看幫助主題(_V)" #: data/ui/sbackup-config.glade:1103 msgid "_About this program" -msgstr "" +msgstr "關於本程式(_A)" #: data/ui/sbackup-config.glade:1154 msgid "Reload configuration" -msgstr "" +msgstr "重新載入設定" #: data/ui/sbackup-config.glade:1168 msgid "Save configuration" -msgstr "" +msgstr "儲存設定" #: data/ui/sbackup-config.glade:1191 msgid "Make a backup now" -msgstr "" +msgstr "現在就建立備份" #: data/ui/sbackup-config.glade:1214 msgid "Open the profile manager" -msgstr "" +msgstr "開啟設定檔管理員" #: data/ui/sbackup-config.glade:1215 msgid "Profiles" -msgstr "" +msgstr "設定檔" #: data/ui/sbackup-config.glade:1253 msgid "" @@ -1998,33 +1976,38 @@ "gzip\n" "bzip2" msgstr "" +"無\n" +"gzip\n" +"bzip2" #: data/ui/sbackup-config.glade:1271 msgid "" "Compression format\n" "Default is set to uncompressed backups." msgstr "" +"壓縮格式\n" +"預設設定為無壓縮備份。" #: data/ui/sbackup-config.glade:1290 data/ui/sbackup-config.glade:1403 msgid "" "You can split the snapshot to make backup on some filesystem that doesn't " "support large files. This functionality can not be used if the backup is " "compressed." -msgstr "" +msgstr "您可以將快照分割,以便備份在不支援大檔案的檔案系統上。若您要壓縮備份,此功能將無法使用。" #: data/ui/sbackup-config.glade:1330 msgid "Do a full backup at least once every" -msgstr "" +msgstr "每隔多久做一次完整備份" #: data/ui/sbackup-config.glade:1339 msgid "" "Unless a set number of days has passed since the last full backup, " "incremental backups will be done." -msgstr "" +msgstr "除非距最近一次的完整備份已超過設定的天數,否則將進行增量備份。" #: data/ui/sbackup-config.glade:1356 data/ui/sbackup-config.glade:3015 msgid "days" -msgstr "" +msgstr "天" #: data/ui/sbackup-config.glade:1370 msgid " " @@ -2032,148 +2015,150 @@ #: data/ui/sbackup-config.glade:1380 data/ui/sbackup-config.glade:2323 msgid "MiB" -msgstr "" +msgstr "MiB" #: data/ui/sbackup-config.glade:1405 msgid "Split backup archives into several chunks" -msgstr "" +msgstr "將備份存檔分割為若干塊" #: data/ui/sbackup-config.glade:1438 data/ui/sbackup-config.glade:2627 #: data/ui/sbackup-config.glade:2863 data/ui/sbackup-config.glade:3111 #: data/ui/sbackup-config.glade:3856 msgid "Help" -msgstr "" +msgstr "幫助" #: data/ui/sbackup-config.glade:1442 data/ui/sbackup-config.glade:2632 msgid "Show help topic about configuration GUI." -msgstr "" +msgstr "顯示有關設置 GUI 的幫助主題。" #: data/ui/sbackup-config.glade:1475 msgid "General" -msgstr "" +msgstr "一般" #: data/ui/sbackup-config.glade:1495 msgid "Included files and directories" -msgstr "" +msgstr "要被包含的檔案和資料夾" #: data/ui/sbackup-config.glade:1570 data/ui/sbackup-config.glade:1818 #: data/ui/sbackup-config.glade:2023 data/ui/sbackup-config.glade:2181 msgid "Remove" -msgstr "" +msgstr "移除" #: data/ui/sbackup-config.glade:1620 data/ui/sbackup-config.glade:1868 msgid "Add File" -msgstr "" +msgstr "加入檔案" #: data/ui/sbackup-config.glade:1671 data/ui/sbackup-config.glade:1919 msgid "Add Directory" -msgstr "" +msgstr "加入資料夾" #: data/ui/sbackup-config.glade:1718 msgid "Include" -msgstr "" +msgstr "包含" #: data/ui/sbackup-config.glade:1739 msgid "Excluded files and directories" -msgstr "" +msgstr "要被排除的檔案和資料夾" #: data/ui/sbackup-config.glade:1952 msgid "Paths" -msgstr "" +msgstr "路徑" #: data/ui/sbackup-config.glade:2074 data/ui/sbackup-config.glade:2232 msgid "Add" -msgstr "" +msgstr "加入" #: data/ui/sbackup-config.glade:2109 msgid "File types" -msgstr "" +msgstr "檔案類型" #: data/ui/sbackup-config.glade:2267 msgid "" "Regular\n" "Expressions" msgstr "" +"正規\n" +"表示法" #: data/ui/sbackup-config.glade:2288 msgid "Do not backup files bigger than" -msgstr "" +msgstr "備份檔案大小限制為" #: data/ui/sbackup-config.glade:2344 msgid "Follow symbolic links" -msgstr "" +msgstr "追隨符號連結" #: data/ui/sbackup-config.glade:2373 msgid "Others" -msgstr "" +msgstr "其他" #: data/ui/sbackup-config.glade:2400 msgid "Exclude" -msgstr "" +msgstr "排除" #: data/ui/sbackup-config.glade:2421 msgid "Use default backup directory" -msgstr "" +msgstr "使用預設的備份資料夾" #: data/ui/sbackup-config.glade:2446 msgid "/var/backup" -msgstr "" +msgstr "/var/backup" #: data/ui/sbackup-config.glade:2472 msgid "Use custom local backup directory" -msgstr "" +msgstr "使用自訂的本地備份資料夾" #: data/ui/sbackup-config.glade:2500 msgid "Select the destination folder" -msgstr "" +msgstr "選擇目的資料夾" #: data/ui/sbackup-config.glade:2526 msgid "Use a remote site" -msgstr "" +msgstr "使用遠端站台" #: data/ui/sbackup-config.glade:2568 msgid "ssh://username:password@example.com/remote/dir/" -msgstr "" +msgstr "ssh://username:password@example.com/remote/dir/" #: data/ui/sbackup-config.glade:2580 msgid "Connect..." -msgstr "" +msgstr "連線..." #: data/ui/sbackup-config.glade:2672 msgid "" "The selected destination is not writeable with current permissions. " "Backups cannot be stored there." -msgstr "" +msgstr "目前擁有的權限無法寫入指定目的資料夾。無法在此存放備份檔案。" #: data/ui/sbackup-config.glade:2704 msgid "Destination" -msgstr "" +msgstr "目的" #: data/ui/sbackup-config.glade:2725 msgid "_No scheduled backups" -msgstr "" +msgstr "不要執行排程備份(_N)" #: data/ui/sbackup-config.glade:2742 msgid "_Simple" -msgstr "" +msgstr "簡易(_S)" #: data/ui/sbackup-config.glade:2747 msgid "" "This option will make a backup not at a precise time but when the computer " "is up. " -msgstr "" +msgstr "這個選項將會在電腦運作的時候自動建立備份。 " #: data/ui/sbackup-config.glade:2761 msgid "_Custom" -msgstr "" +msgstr "自訂(_C)" #: data/ui/sbackup-config.glade:2781 msgid "Do backups" -msgstr "" +msgstr "執行備份於" #: data/ui/sbackup-config.glade:2798 msgid "Cron time definition" -msgstr "" +msgstr "Cron 定義時間" #: data/ui/sbackup-config.glade:2834 msgid "" @@ -2182,10 +2167,14 @@ "weekly\n" "monthly" msgstr "" +"每小時\n" +"每天\n" +"每周\n" +"每月" #: data/ui/sbackup-config.glade:2867 msgid "Show help topic about scheduled backups." -msgstr "" +msgstr "顯示關於排程備份的幫助主題。" #: data/ui/sbackup-config.glade:2905 msgid "" @@ -2193,22 +2182,24 @@ "choosing an interval or precisely by a custom cron definition. See \"man 5 " "crontab\" for cron time definition format." msgstr "" +"欲設定排程 (即自動化) 備份時段,您可以簡單地選擇一個間隔,也可以用 cron 的時間配置來精確安排。有關 cron " +"的時間格式定義詳見「man 5 crontab」。" #: data/ui/sbackup-config.glade:2937 msgid "Schedule" -msgstr "" +msgstr "定時" #: data/ui/sbackup-config.glade:2955 msgid "Enable purging of old backups" -msgstr "" +msgstr "啟用老舊備份清理" #: data/ui/sbackup-config.glade:2983 msgid "Simple cut-off: Erase all backups older than" -msgstr "" +msgstr "簡易裁切式:備份經過幾天後將被清除" #: data/ui/sbackup-config.glade:3039 msgid "Logarithmic" -msgstr "" +msgstr "對數式" #: data/ui/sbackup-config.glade:3065 msgid "" @@ -2220,259 +2211,433 @@ "Keep one backup per quarter from 2nd last year\n" "Keep one backup per year further into past" msgstr "" +"分階段減少過去擁有的備份:\n" +"保留昨天建立的所有備份\n" +"保留上星期每天一個備份\n" +"保留上個月每週一個備份\n" +"保留去年每月一個備份\n" +"保留前年至去年每季一個備份\n" +"保留過去每年一個備份" #: data/ui/sbackup-config.glade:3116 msgid "Show help topic about purging of backups." -msgstr "" +msgstr "顯示有關清理備份的幫助主題。" #: data/ui/sbackup-config.glade:3152 msgid "" "Note: Additionally all incomplete and irrecoverable backups will be " "erased as long as there is a complete backup snapshot made later on." -msgstr "" +msgstr "注意:如果存在新的完整備份快照,先前所有不完全和不可恢復的備份都將被刪除。" #: data/ui/sbackup-config.glade:3184 msgid "Purging" -msgstr "" +msgstr "清除" #: data/ui/sbackup-config.glade:3186 msgid "Cleaning old backups" -msgstr "" +msgstr "清理舊的備份" #: data/ui/sbackup-config.glade:3209 msgid "Logging" -msgstr "" +msgstr "記錄" #: data/ui/sbackup-config.glade:3234 msgid "Debug is just for debbuging purpose.Info is the recommended setting" -msgstr "" +msgstr "Debug 只作為程式除錯用途。Info 是建議的設定" #: data/ui/sbackup-config.glade:3236 msgid "Log level" -msgstr "" +msgstr "日誌等級" #: data/ui/sbackup-config.glade:3248 msgid "Debug is just for debbuging purpose. Info is the recommended setting." -msgstr "" +msgstr "Debug 只作為程式除錯用途。Info 是建議的設定。" #: data/ui/sbackup-config.glade:3274 msgid "Log file directory" -msgstr "" +msgstr "日誌檔案資料夾" #: data/ui/sbackup-config.glade:3320 msgid "Report by mail" -msgstr "" +msgstr "從郵件傳送報告" #: data/ui/sbackup-config.glade:3350 msgid "From" -msgstr "" +msgstr "從" #: data/ui/sbackup-config.glade:3361 msgid "SMTP server" -msgstr "" +msgstr "SMTP 伺服器" #: data/ui/sbackup-config.glade:3375 data/ui/sbackup-config.glade:4053 msgid "Port" -msgstr "" +msgstr "連接埠" #: data/ui/sbackup-config.glade:3391 msgid "To" -msgstr "" +msgstr "至" #: data/ui/sbackup-config.glade:3478 msgid "Use a username and password" -msgstr "" +msgstr "使用帳號和密碼" #: data/ui/sbackup-config.glade:3508 data/ui/sbackup-config.glade:4075 msgid "Username" -msgstr "" +msgstr "帳號" #: data/ui/sbackup-config.glade:3540 data/ui/sbackup-config.glade:4124 msgid "Password" -msgstr "" +msgstr "密碼" #: data/ui/sbackup-config.glade:3584 msgid "Use secure connection" -msgstr "" +msgstr "使用安全連線" #: data/ui/sbackup-config.glade:3615 msgid "Choose a certificate file" -msgstr "" +msgstr "選擇憑證檔案" #: data/ui/sbackup-config.glade:3629 msgid "Key" -msgstr "" +msgstr "密鑰" #: data/ui/sbackup-config.glade:3645 msgid "Certificate" -msgstr "" +msgstr "憑證" #: data/ui/sbackup-config.glade:3659 msgid "Choose a key file" -msgstr "" +msgstr "選擇鑰匙檔案" #: data/ui/sbackup-config.glade:3731 msgid "Test _mail settings" -msgstr "" +msgstr "測試郵件設定(_M)" #: data/ui/sbackup-config.glade:3772 msgid "Report" -msgstr "" +msgstr "報表" #: data/ui/sbackup-config.glade:3811 msgid "Warning" -msgstr "" +msgstr "警告" #: data/ui/sbackup-config.glade:3860 msgid "Show help topic about default values." -msgstr "" +msgstr "顯示有關預設值的幫助主題。" #: data/ui/sbackup-config.glade:3893 msgid "_Set" -msgstr "" +msgstr "設置(_S)" #: data/ui/sbackup-config.glade:3935 msgid "Set remote target" -msgstr "" +msgstr "設定遠端目標" #: data/ui/sbackup-config.glade:3957 msgid "Type of service" -msgstr "" +msgstr "服務類型" #: data/ui/sbackup-config.glade:3997 msgid "Hostname" -msgstr "" +msgstr "主機名稱" #: data/ui/sbackup-config.glade:4027 msgid "Details" -msgstr "" +msgstr "詳細資料" #: data/ui/sbackup-config.glade:4157 msgid "Show password" -msgstr "" +msgstr "顯示密碼" #: data/ui/sbackup-config.glade:4217 msgid "_Connect" -msgstr "" +msgstr "連線(_C)" #: data/ui/sbackup-config.glade:4293 msgid "Make a full backup" +msgstr "建立一個完整備份" + +#: data/ui/sbackup-legacy-restore.glade:7 +msgid "Restore files/directories" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:25 +msgid "Restore Source Folder" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:90 +msgid "Available backups:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:109 +msgid "" +"Type in this box text like that:\n" +"\n" +"/home/user/folder - To use a local folder\n" +"ssh://user:password@machine:/remote/folder - To use a ssh location\n" +"ftp://user:password@machine:/remote/folder - To use a ftp location" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:179 +msgid "Use custom:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:200 +msgid "Use default:" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:241 +msgid "Files and Folders to restore" +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:345 data/ui/sbackup-restore.glade:782 +msgid "Restore" +msgstr "還原" + +#: data/ui/sbackup-legacy-restore.glade:390 +msgid "Restore As..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:448 +msgid "Restoring, this might take some time ..." +msgstr "" + +#: data/ui/sbackup-legacy-restore.glade:463 +msgid "gtk-cancel" msgstr "" #: data/ui/sbackup-restore.glade:38 msgid "Backup destination" -msgstr "" +msgstr "備份目的地" #: data/ui/sbackup-restore.glade:52 msgid "Displays the manual in Help browser." -msgstr "" +msgstr "於說明瀏覽器中顯示手冊。" #: data/ui/sbackup-restore.glade:85 msgid "Default profile's destination" -msgstr "" +msgstr "預設設定檔的目的地" #: data/ui/sbackup-restore.glade:90 msgid "" "Set backup destination to the place specified in default configuration " "profile" -msgstr "" +msgstr "將備份目的地設為預設設定檔所指定的位置" #: data/ui/sbackup-restore.glade:137 msgid "Custom destination" -msgstr "" +msgstr "自訂目的地" #: data/ui/sbackup-restore.glade:143 msgid "" "Select a backup destination on your harddisk or at a remote site. Press " "Apply when ready." -msgstr "" +msgstr "從您的硬碟或遠端站台選擇一個備份目的地。準備好之後按「套用」。" #: data/ui/sbackup-restore.glade:184 msgid "Choose a destination folder. For remote sites fill URI in text field" -msgstr "" +msgstr "選擇一個目的資料夾,或是在文字框中輸入遠端站台的 URI" #: data/ui/sbackup-restore.glade:201 msgid "Change destination to path specified in left text field" -msgstr "" +msgstr "將目的地變更為左邊文字欄內的指定路徑" #: data/ui/sbackup-restore.glade:266 msgid "Select a bold printed date to get the list of backups for that date." -msgstr "" +msgstr "選擇一個粗體標示的日期以獲取該天的備份列表。" #: data/ui/sbackup-restore.glade:310 msgid "Available backups" -msgstr "" +msgstr "可用的備份" #: data/ui/sbackup-restore.glade:398 msgid "Delete snapshot" -msgstr "" +msgstr "刪除快照" #: data/ui/sbackup-restore.glade:436 msgid "Delete" -msgstr "" - -#: data/ui/sbackup-restore.glade:475 -msgid "Upgrade snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:515 -msgid "Upgrade" -msgstr "" +msgstr "刪除" -#: data/ui/sbackup-restore.glade:553 +#: data/ui/sbackup-restore.glade:473 msgid "Snapshot History" -msgstr "" +msgstr "快照歷史" -#: data/ui/sbackup-restore.glade:579 +#: data/ui/sbackup-restore.glade:499 msgid "Current base:" -msgstr "" +msgstr "目前基於:" -#: data/ui/sbackup-restore.glade:620 +#: data/ui/sbackup-restore.glade:540 msgid "Select a snapshot on this list to rebase on it." -msgstr "" +msgstr "選擇列表上的一個快照作為新的基底。" -#: data/ui/sbackup-restore.glade:695 +#: data/ui/sbackup-restore.glade:615 msgid "Rebase" -msgstr "" +msgstr "重定基底" -#: data/ui/sbackup-restore.glade:746 +#: data/ui/sbackup-restore.glade:666 msgid "Snapshot Management" -msgstr "" +msgstr "快照管理" -#: data/ui/sbackup-restore.glade:785 +#: data/ui/sbackup-restore.glade:705 msgid "Snapshot details" -msgstr "" +msgstr "快照詳情" -#: data/ui/sbackup-restore.glade:850 data/ui/sbackup-restore.glade:867 +#: data/ui/sbackup-restore.glade:770 data/ui/sbackup-restore.glade:787 msgid "Restores files/directories from the selected snapshot" -msgstr "" - -#: data/ui/sbackup-restore.glade:862 -msgid "Restore" -msgstr "" +msgstr "從選擇的快照中還原檔案/資料夾" -#: data/ui/sbackup-restore.glade:882 data/ui/sbackup-restore.glade:901 +#: data/ui/sbackup-restore.glade:802 data/ui/sbackup-restore.glade:821 msgid "" "Restores files/directories recursively starting from the base snapshot to " "the selected snapshot" -msgstr "" +msgstr "從選擇的快照到其母快照為止,漸進還原檔案/資料夾" -#: data/ui/sbackup-restore.glade:896 +#: data/ui/sbackup-restore.glade:816 msgid "Revert" -msgstr "" +msgstr "回溯" -#: data/ui/sbackup-restore.glade:939 +#: data/ui/sbackup-restore.glade:859 msgid "Restoration Management" -msgstr "" +msgstr "還原管理" -#: data/ui/sbackup-restore.glade:964 +#: data/ui/sbackup-restore.glade:884 msgid "Export Management" -msgstr "" +msgstr "匯出管理" -#: data/ui/sbackup-restore.glade:1056 +#: data/ui/sbackup-restore.glade:976 msgid "Headline" -msgstr "" +msgstr "頭條" -#: data/ui/sbackup-restore.glade:1069 +#: data/ui/sbackup-restore.glade:989 msgid "Content" -msgstr "" +msgstr "內容" + +#, python-format +#~ msgid "No need to rebase a full snapshot '%s'" +#~ msgstr "不需要為完整的快照「%s」重定基底" + +#, python-format +#~ msgid "" +#~ "'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken " +#~ msgstr "「%(snapshotToRebase)s」沒有「base」檔案,它可能已經損毀 " + +#, python-format +#~ msgid "" +#~ "Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= " +#~ "'%(NewBaseSnapshot)s' " +#~ msgstr "無法用快照重定基底於先前的版本:「%(snapshotToRebase)s」<=「%(NewBaseSnapshot)s」 " + +#, python-format +#~ msgid "Rebasing '%(current)s' on '%(base)s'" +#~ msgstr "以「%(current)s」重定基底「%(base)s」" + +#, python-format +#~ msgid "An error occurred when pulling snapshot '%s'." +#~ msgstr "當取回快照「%s」時發生錯誤。" + +#, python-format +#~ msgid "Base of snapshot '%s' is not set." +#~ msgstr "快照「%s」的基底尚未設置。" + +#, python-format +#~ msgid "Cancelling pull of snapshot '%s'" +#~ msgstr "取消快照「%s」的取回" + +#, python-format +#~ msgid "Unable to remove upgrade stamp: %s" +#~ msgstr "無法移除升級標記:%s" + +#, python-format +#~ msgid "Upgrading from v1.0 to v1.2: %s" +#~ msgstr "從 v1.0 升級至 v1.2:%s" + +#, python-format +#~ msgid "Upgrading to v1.3: %s" +#~ msgstr "升級至 v1.3:%s" + +#, python-format +#~ msgid "Upgrading to v1.4: %s" +#~ msgstr "升級至 v1.4:%s" + +#, python-format +#~ msgid "Upgrading to v1.5: %s" +#~ msgstr "升級至 v1.5:%s" + +#, python-format +#~ msgid "The SNAR file already exist for snapshot '%s'. It is not overwritten." +#~ msgstr "SNAR 檔案已經存在於快照「%s」。它沒有被覆寫。" + +#~ msgid "" +#~ "There are snapshots stored in outdated snapshot formats. Please upgrade them " +#~ "using 'Simple Backup-Restoration' if you want to use them." +#~ msgstr "這些快照的格式已經過時。若您要使用它們,請使用「Simple Backup-Restoration」將它們升級。" + +#~ msgid "" +#~ "There are snapshots with old snapshot format. Please upgrade these using the " +#~ "Restoration tool if you want to use them." +#~ msgstr "這些是基於舊版格式的快照。若您要使用它們,請使用復原工具將它們升級。" + +#, python-format +#~ msgid "" +#~ "Snapshot version is not supported (Only %(supportedversion)s is supported). " +#~ "Version '%(currentversion)s' found. You should upgrade it. " +#~ msgstr "" +#~ "不支援該快照版本 (只支援 %(supportedversion)s )。發現「%(currentversion)s」版本。您應該要將它升級。 " + +#~ msgid "The version of the snapshot is greater than the supported one!" +#~ msgstr "快照的版本大於支援版本!" + +#, python-format +#~ msgid "" +#~ "Upgrading the selected snapshot `%s` might corrupt your backup for this " +#~ "particular point in time. You cannot undo this operation. It is recommended " +#~ "to create a copy of the snapshot directory before upgrading it. The upgrade " +#~ "process takes a while - be patient.\n" +#~ "\n" +#~ "Are you sure that you want to upgrade the snapshot now?" +#~ msgstr "" +#~ "升級選擇的快照「%s」可能會干擾您在這一時間所備份的資料。您無法復原這個動作。建議在升級快照前先建立一份副本。升級過程將會進行一段時間 ─ " +#~ "請耐心等待。\n" +#~ "\n" +#~ "您確定要現在升級這個快照?" + +#~ msgid "Do you really want to upgrade snapshot?" +#~ msgstr "您真的要升級快照嗎?" + +#, python-format +#~ msgid "Upgrade snapshot '%s'" +#~ msgstr "升級快照「%s」" + +#~ msgid "Snapshot was sucessfully upgraded." +#~ msgstr "快照已成功升級。" + +#~ msgid "Simple Backup upgrade" +#~ msgstr "Simple Backup 升級" + +#~ msgid "Upgrade finished" +#~ msgstr "升級完成" + +#, python-format +#~ msgid "" +#~ "While attempting to upgrade snapshot the following error occurred:\n" +#~ "%s" +#~ msgstr "" +#~ "當嘗試升級快照時發生下列錯誤:\n" +#~ "%s" + +#~ msgid "Unable to upgrade snapshot" +#~ msgstr "無法升級快照" + +#, python-format +#~ msgid "Do you really want to rebase '%(current)s' on '%(base)s' ?" +#~ msgstr "您真的要將「%(current)s」代替「%(base)s」成為新的基底?" + +#, python-format +#~ msgid "File '%(file)s' does not exist." +#~ msgstr "檔案「%(file)s」不存在。" + +#~ msgid "Upgrade snapshot" +#~ msgstr "升級快照" + +#~ msgid "Upgrade" +#~ msgstr "升級" diff -Nru sbackup-0.11.4/scripts/sbackup-legacy-restore sbackup-0.11.6/scripts/sbackup-legacy-restore --- sbackup-0.11.4/scripts/sbackup-legacy-restore 1970-01-01 01:00:00.000000000 +0100 +++ sbackup-0.11.6/scripts/sbackup-legacy-restore 2013-09-17 20:50:03.000000000 +0200 @@ -0,0 +1,57 @@ +#!/usr/bin/env python +# +# sbackup - legacy support for restore operation +# +# Copyright (c)2013: Jean-Peer Lorenz +# Copyright (c)2005-2008: Aigars Mahinovs +# +# This program 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. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +# Running this command will restore a file or directory from backup. +# This is also a backend for Gnome GUI. + + +import os +import sys + +from sbackup import legacy_restore + + +if __name__ == "__main__": + # Check for root privileges +# if os.getuid() != 0: +# print "Root or sudo privileges required!" +# sys.exit(1) + + if len(sys.argv) == 2 and sys.argv[1] == '--gui': + legacy_restore.SRestoreGTK() + + else: + r = legacy_restore.SRestore() + if len(sys.argv) == 3: + ret = r.restore( sys.argv[1], sys.argv[2] ) + elif len(sys.argv) == 4: + ret = r.restore( sys.argv[1], sys.argv[2], sys.argv[3] ) + else: + print "sbackup command line restore utility (legacy support)\n" + print " Usage: sbackup-legacy-restore BACKUP_PATH FILE_OR_DIR_TO_RESTORE [TARGET_DIR]" + print " Note: BACKUP_PATH must include the snapshot subdirectory name, for example:" + print " /var/backup/2005-08-09_14.59.38.441112.myhost.ful/" + print " Use 'sbackup-legacy-restore --gui' for more ease of use.\n" + sys.exit(1) + + if not ret: + print "Restore FAILED! Please check you parameters." diff -Nru sbackup-0.11.4/scripts/sbackup-upgrade-backups sbackup-0.11.6/scripts/sbackup-upgrade-backups --- sbackup-0.11.4/scripts/sbackup-upgrade-backups 2011-02-13 18:22:24.000000000 +0100 +++ sbackup-0.11.6/scripts/sbackup-upgrade-backups 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -#!/usr/bin/env python -# -# Simple Backup - upgrades all backups found -# -# Copyright (c)2008-2010: Jean-Peer Lorenz -# Copyright (c)2007-2009: Ouattara Oumar Aziz -# -# This program 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. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - - -if __name__ == "__main__": - - import sys - import os - - from sbackup.util import system - system.set_default_environment() - system.set_display_from_session() - - from sbackup.util import get_locale_dir, get_locale_domain - application = get_locale_domain() - locale_dir = get_locale_dir() - - import gettext - gettext.bindtextdomain(application, locale_dir) - gettext.textdomain(application) - - from gettext import gettext as _ - from sbackup.core.UpgradeManager import UpgradeManager - - if not len(sys.argv) in [2]: - print _(""" -Simple Backup suit command line backup format upgrade -Usage: upgrade-backup backup-target-url -Note: backup-target-url must not include the snapshot subdirectory name, for example: - - /var/backup/ - -Use simple-restore-gnome for more ease of use. -""") - sys.exit(1) - - try : - u = UpgradeManager() - path = os.path.abspath(sys.argv[1]) - u.upgradeAll(path) - except Exception, e : - import traceback - from sbackup.util.log import LogFactory - LogFactory.getLogger().error(str(e)) - LogFactory.getLogger().error(traceback.format_exc()) diff -Nru sbackup-0.11.4/setup.py.in sbackup-0.11.6/setup.py.in --- sbackup-0.11.4/setup.py.in 2011-02-13 18:22:35.000000000 +0100 +++ sbackup-0.11.6/setup.py.in 2013-09-17 20:49:58.000000000 +0200 @@ -17,11 +17,12 @@ package_data = {'' : ['resources', 'metainfo']}, data_files = [('share/sbackup', ['data/ui/sbackup-restore.glade', + 'data/ui/sbackup-legacy-restore.glade', 'data/ui/sbackup-config.glade', 'scripts/sbackup-run', 'scripts/sbackup-config-gtk', 'scripts/sbackup-restore-gtk', - 'scripts/sbackup-upgrade-backups', + 'scripts/sbackup-legacy-restore', 'scripts/sbackupconfig.py', 'scripts/multipleTarScript', diff -Nru sbackup-0.11.4/src/sbackup/ar_backend/tar.py sbackup-0.11.6/src/sbackup/ar_backend/tar.py --- sbackup-0.11.4/src/sbackup/ar_backend/tar.py 2011-02-13 18:22:20.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/ar_backend/tar.py 2013-09-17 20:50:00.000000000 +0200 @@ -35,7 +35,6 @@ import tempfile import shutil import re -import sys from datetime import datetime @@ -46,8 +45,8 @@ from sbackup.util.log import LogFactory from sbackup.util.structs import SBdict -from sbackup.util.exceptions import SBException from sbackup.util import exceptions +from sbackup.util.exceptions import SBException from sbackup.util import constants from sbackup.util import system from sbackup import util @@ -248,6 +247,7 @@ _snpname = snapshot.getName() options = ["-cS", "--directory=%s" % _FOP.pathsep, "--ignore-failed-read", + "--no-check-device", "--blocking-factor", str(constants.TAR_BLOCKING_FACTOR), "--totals" ] @@ -312,6 +312,11 @@ _checkpsize = _snpsize / _ncheckp _checkp = int(_checkpsize / constants.TAR_RECORDSIZE) if _checkp > 0: + # LP: #875634 + # Sometimes the calculation of the space required goes badly wrong + # and we could end-up with _checkp=1 for 30GB to save, making tar + # VERY slow. Fix: set minimum value to 100 + _checkp = max(100, _checkp) options.append("--checkpoint=%s" % _checkp) _progessf = util.get_resource_file(resource_name = "sbackup-progress") options.append('--checkpoint-action=exec=%s' % _progessf) @@ -1050,9 +1055,9 @@ n += 1 header += c try: - fd.close() - except: - LogFactory.getLogger().warn("error on closing the snarfile header after reading: " + str(sys.exc_info()[1])) + _FOP.close_stream(fd) + except exceptions.FileAlreadyClosedError, error: + log.LogFactory.getLogger().warn(_("File was already closed (ignored): %s") % error) return header diff -Nru sbackup-0.11.4/src/sbackup/backupproc.py sbackup-0.11.6/src/sbackup/backupproc.py --- sbackup-0.11.4/src/sbackup/backupproc.py 2011-02-13 18:22:19.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/backupproc.py 2013-09-17 20:50:00.000000000 +0200 @@ -1,6 +1,6 @@ # Simple Backup - the actual backup service # -# Copyright (c)2008-2010: Jean-Peer Lorenz +# Copyright (c)2008-2010,2013: Jean-Peer Lorenz # Copyright (c)2007-2008: Ouattara Oumar Aziz # # This program is free software; you can redistribute it and/or modify @@ -279,9 +279,11 @@ self.__write_errors_to_log() + self.__bprofilehdl.do_hook('pre-backup') self.__bprofilehdl.prepare() self.__bprofilehdl.process() self.__exitcode = self.__bprofilehdl.finish() + self.__bprofilehdl.do_hook('post-backup') except exceptions.BackupCanceledError: self.__on_backup_canceled() diff -Nru sbackup-0.11.4/src/sbackup/core/ConfigManager.py sbackup-0.11.6/src/sbackup/core/ConfigManager.py --- sbackup-0.11.4/src/sbackup/core/ConfigManager.py 2011-02-13 18:22:21.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/core/ConfigManager.py 2013-09-17 20:50:00.000000000 +0200 @@ -1,6 +1,6 @@ # Simple Backup - configuration file handling # -# Copyright (c)2009-2010: Jean-Peer Lorenz +# Copyright (c)2009-2010,2013: Jean-Peer Lorenz # Copyright (c)2007-2009: Ouattara Oumar Aziz # # This program is free software; you can redistribute it and/or modify @@ -19,87 +19,11 @@ # """ -Format of the configuration file used by SBackup: +Configuration definition -[general] -mountdir = /mnt/sbackup -target=/var/backup -#target=ssh://user:pass@example.com/home/user/backup/ - -# Maximal interval between two full backups (in days) -maxincrement = 21 - -# Backup format: - -# none : use a tar - All files are stored in a non compressed tar archive -# gzip : use a tar.gz - All files are stored in the files.tar.gz -# bzip2 :use a tar.bz2 - All files are stored in the files.tar.bz2 -format = gzip -# backup the links -backuplinks=1 -# follow symlinks -followlinks=1 - -# For the split functionality : -# this should be an integer. -# It represent the size in KiB (1024 B) of each archive -# (splitsize <= 0: unlimited) -splitsize = 0 - -# Set the package manager command to backup the package list -packagecmd = - -[log] -level = 20 -file = sbackup.log - -[report] -from = -to = -smtpserver = -smtpport = -smtptls = - - -[dirconfig] -# In this section you describe, what directories to backup and what to skip -# More precise commands override wider ones, for example: -# /var=1 # This means that the whole /var directory is to be backuped -# /var/cache=0 # This means the /var/cache and its subdirectories are not -# # to be backuped -# In this case all /var, except /var/cache will be backuped -# It works the othe way around too -# by default nothing is backuped - -/etc/=1 -/home/=1 -/usr/local/=1 -/var/=1 -/var/cache/=0 -/var/tmp/=0 -/proc/=0 -/dev/=0 -/sys/=0 -/tmp/=0 -/var/tmp/=0 - -[schedule] -anacron = daily -cron = +For a description of sbackup's file format please have a look at the shipped +example configuration file in sbackup/data/sbackup.conf.example. -[exclude] - -# Comma-separated list of regular expressions to exclude from backup -# use this to exclude certain types of files or directories -# -# Note: If any of these expressions matches within the whole pathname -# of the file, it will NOT be backuped. Keep this list as specific -# and as short as possible. - -regex=\.mp3,\.avi,\.mpeg,\.mpg,\.mkv,\.ogg,\.ogm,\.tmp,/home/[^/]+?/\.thumbnails/,/home/[^/]+?/\.Trash,/home/[^/]+?/\..+/[cC]ache - -# Do not backup files bigger then this (in bytes) -maxsize=100000000 """ @@ -1333,6 +1257,10 @@ if not os.path.exists(tempdir) : os.mkdir(tempdir) + #LP #785495: make the temp directory RWX only by owner + if (os.stat(tempdir).st_mode & 0777) != 0700: + os.chmod(tempdir,0700) + return tempdir def get_profilename(self, conffile): @@ -1392,7 +1320,6 @@ 'format' : str, 'splitsize' : int, 'purge' : str, - 'run4others' : int, 'followlinks' : int, 'stop_if_no_target' : int, 'packagecmd' : str}, @@ -1404,6 +1331,7 @@ 'dirconfig' : { '*' : str }, 'exclude' : { 'regex' : list, 'maxsize' : int }, 'places' : { 'prefix' : str }, + 'hooks' : {'pre-backup': list, 'post-backup': list }, 'schedule' : {'anacron' : str , 'cron' : str } } @@ -1658,20 +1586,20 @@ def __init__(self): Configuration.__init__(self) - self._regex_excludes = "\.mp3$,\.avi$,\.mpeg$,\.mkv$,\.ogg$,\.iso$,"\ - "/home/[^/]+?/\.gvfs/,"\ - "/home/[^/]+?/\.thumbnails/,"\ - "/home/[^/]+?/\..+/[tT]rash/,"\ - "/home/[^/]+?/\..+/[cC]ache/,"\ + self._regex_excludes = "^/home/[^/]+?/\.gvfs(/|$),"\ + "^/home/[^/]+?/\.thumbnails(/|$),"\ + "^/home/[^/]+?/\..+/[tT]rash(/|$),"\ + "^/home/[^/]+?/\.cache(/|$),"\ + "^/home/[^/]+?/\..+/[cC]ache(/|$),"\ + "^/home/[^/]+?/\..+/lock(/|$),"\ "~$" - self._maxinc = 7 self._cformat = 'none' self._follow_links = False self._splitsize = 0 self._max_filesize = -1 #Bugfix LP #146618 - self._loglevel = 20 + self._loglevel = "20" # set values as strings (LP #1159705) self._report_smtpfrom = Infos.SMTPFROM self._lockfile = "/var/lock/sbackup/sbackup.lock" diff -Nru sbackup-0.11.4/src/sbackup/core/profile_handler.py sbackup-0.11.6/src/sbackup/core/profile_handler.py --- sbackup-0.11.4/src/sbackup/core/profile_handler.py 2011-02-13 18:22:21.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/core/profile_handler.py 2013-09-17 20:50:00.000000000 +0200 @@ -1,6 +1,6 @@ # Simple Backup - process a certain profile (a distinct configuration) # -# Copyright (c)2008-2010: Jean-Peer Lorenz +# Copyright (c)2008-2010,2013: Jean-Peer Lorenz # Copyright (c)2007-2008: Ouattara Oumar Aziz # # This program is free software; you can redistribute it and/or modify @@ -38,7 +38,6 @@ from sbackup.fs_backend import fam from sbackup.core.SnapshotManager import SnapshotManager -from sbackup.core.UpgradeManager import UpgradeManager from sbackup.core import snapshot from sbackup import util @@ -77,7 +76,6 @@ self.__profilename = self.config.getProfileName() self.__state.set_profilename(self.__profilename) - self.__um = UpgradeManager() self.__snpman = None self.__snapshot = None @@ -86,6 +84,29 @@ self.logger.debug("Instance of BackupProfileHandler created.") + def do_hook(self, hookname): + """Runs scripts optionally defined in section 'hooks' of + configuration file. Currently defined are + * pre-backup - before preparation of backup starts + * post-backup - after completion and finishing of backup + + """ + #LP #173490 + import commands + hooks = None + if self.config.has_option('hooks', hookname): + hooks = str(self.config.get('hooks', hookname)).split(",") + + if hooks is not None: + self.logger.info(_("Running of hooks: %s") % hookname) + for hook in hooks: + result = commands.getstatusoutput(hook) + if( 0 != result[0]): + raise exceptions.HookedScriptError(\ + "Hook %s returned error: '%s' (exit code=%s)" % (hookname, + result[1], + result[0])) + def prepare(self): self.logger.info(_("Preparation of backup process")) _uri = self.config.get_destination_path() @@ -104,7 +125,6 @@ """Runs the whole backup process: 1. check pre-conditions - 2. test for upgrades (but don't perform) 3. purge snapshots (if configured) 4. open new snapshot containing common metadata (full or incr. depending on existing one, base, settings etc.) @@ -116,23 +136,7 @@ assert self.__fam_target_hdl.is_initialized() self.__snpman = SnapshotManager(self.__fam_target_hdl.query_mount_uri()) - - # Upgrade Target - # But we should not upgrade without user's agreement! - # Solution 1: add an option: AutoAupgrade = True/False - # 2: start with a new and full dump and inform the user that - # there are snapshots in older versions - needupgrade = False - try: - needupgrade = self.__um.need_upgrade(self.__fam_target_hdl.query_mount_uri()) - except exceptions.SBException, exc: - self.logger.warning(str(exc)) - - if needupgrade: - self.__state.set_state('needupgrade') - _msg = _("There are snapshots stored in outdated snapshot formats. Please upgrade them using 'Simple Backup-Restoration' if you want to use them.") - self.logger.warning(_msg) - + # get basic informations about new snapshot self.__state.set_state('prepare') (snppath, base) = self.__retrieve_basic_infos(force_full_snp = self.__full_snp) diff -Nru sbackup-0.11.4/src/sbackup/core/SnapshotManager.py sbackup-0.11.6/src/sbackup/core/SnapshotManager.py --- sbackup-0.11.4/src/sbackup/core/SnapshotManager.py 2011-02-13 18:22:21.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/core/SnapshotManager.py 2013-09-17 20:50:00.000000000 +0200 @@ -1,6 +1,6 @@ # Simple Backup - snapshot handling # -# Copyright (c)2008-2010: Jean-Peer Lorenz +# Copyright (c)2008-2010,2013: Jean-Peer Lorenz # Copyright (c)2007-2008: Ouattara Oumar Aziz # # This program is free software; you can redistribute it and/or modify @@ -35,7 +35,6 @@ import time import types - from sbackup.pkginfo import Infos from sbackup.fs_backend import fam @@ -53,10 +52,9 @@ from sbackup.util.exceptions import SBException from sbackup.util.exceptions import NotValidSnapshotException from sbackup.util.exceptions import NotValidSnapshotNameException -from sbackup.util.exceptions import RebaseSnpException -from sbackup.util.exceptions import RebaseFullSnpForbidden from sbackup.util.exceptions import RemoveSnapshotHasChildsError from sbackup.util.exceptions import NotSupportedError +from sbackup.util.exceptions import FileAccessException _EXT_CORRUPT_SNP = ".corrupt" @@ -68,12 +66,9 @@ :todo: Remove instance variables 'status' and implement an observer\ pattern or progress function hooks! - :note: Rebasing of snapshots is currently disabled due to severe performance issues. - Adapt to use FAM before re-enabling! + :note: Rebasing of snapshots is disabled due to severe performance issues. """ - REBASEDIR = "rebasetmp" - def __init__(self, destination): """Default constructor. Takes the path to the target backup directory as parameter. @@ -199,13 +194,15 @@ for _snppath in listing : _snpname = self._fop.get_basename(_snppath) - _stamp = self._fop.joinpath(_snppath, "upgrade") + try: + self._fop.test_dir_access(_snppath) + except FileAccessException, error: + self.logger.info("Unable to access `%s'. Skipped." % _snppath) + continue + if _snpname.endswith(_EXT_CORRUPT_SNP): self.logger.info("Corrupt snapshot `%s` found. Skipped." % _snpname) continue - if self._fop.path_exists(_stamp): # FIXME: add checks whether stamp is valid - self.logger.info("Snapshot `%s` is being upgraded. Skipped." % _snpname) - continue try: self.__snapshots.append(Snapshot(_snppath)) except NotValidSnapshotException, error : @@ -256,312 +253,6 @@ ### return snps - def exportSnapshot(self, snapshot, target, rebase = False): - """There are two ways of exporting a snapshot. You can either - copy the dir to the target or re-base the snapshot before copying it. - - :todo: Think about a plugins system that will be used to export on\ - TAPE, on DVD and so on. - - :attention: Not implemented yet! - """ - raise NotSupportedError - - def rebaseSnapshot(self, torebase, newbase = None): - """The re-base operation is the changing of the base of a - snapshot. Basically, for 3 snapshots A, B and C that means, - if we re-base C to A, we can now remove B without problems. - The informations originally contained in C will be updated - to keep the changes occurred in B inside C. - - Re-basing is done by doing many one-step re-base operation - one after another. - - Re-base principle: - snp1 -> snp2 -> snp3 -> snp4 - - - re-base snp3 on snp1 (snp3 has the newer version of the file it contains) - - remove snp3 "ver" file ( means the snapshot is being processed ) - - for each file in snp2 : - - if included in snp3 -> pass - - if not : push the file in snp3 - - when finished, checks and merge the includes.list and excludes.list - - change the base file content to the new base - - write the "ver" file - - If an error is encountered -> cancel Rebase ( we shouldn't - loose the snapshot !) - - :raise SBException: if torebase is a full backup or newbase is ealier - - :todo: Remove status message from this non-gui class! - - """ - self.logger.info("Re-base of snapshot '%s' - new base: '%s'" % (torebase, newbase)) - - # checks before processing - if torebase.isfull() : - raise RebaseFullSnpForbidden(\ - _("No need to rebase a full snapshot '%s'") % torebase.getName()) - if not torebase.getBase(): - raise RebaseSnpException(_("'%(snapshotToRebase)s' doesn't have 'base' file , it might have been broken ")\ - % {'snapshotToRebase':torebase.getName()}) - - # check if the new base is earlier - if newbase and torebase.getName() <= newbase.getName() : - raise RebaseSnpException(_("Cannot rebase a snapshot on an earlier one : '%(snapshotToRebase)s' <= '%(NewBaseSnapshot)s' ")\ - % { 'snapshotToRebase':torebase.getName(), - 'NewBaseSnapshot': newbase.getName() }) - - currentTorebase = torebase - - while currentTorebase.getBase(): - self.statusMessage = _("Rebasing '%(current)s' on '%(base)s'")\ - % { "current": currentTorebase, - "base" : currentTorebase.getBase()} - self.logger.info(self.statusMessage) - currentTorebase = self._rebaseOnLastSnp(currentTorebase) - # re-basing finished? - if newbase and currentTorebase.getBase(): -# TODO: replace <= by is_older/is_younger! - if currentTorebase.getBase() <= newbase.getName(): - break - - def __is_older(self, to_rebase, new_base): - """Checks if the ??? is more recent than ??? - - :todo: Not fully implemented and not used by now. Use it! - """ - _res = True - if to_rebase.getBaseSnapshot().getName() <= new_base.getName(): - pass - - def convertToFullSnp(self, snapshot): - """Re-base a snapshot till the full one and then make it full. - - :param snapshot: the snapshot to make full - :type snapshot: `Snapshot` - - """ - self.rebaseSnapshot(snapshot) - - def _pullSnpContent(self, snapshot, topullSnp): - """Move the 'topullSnp' snapshot content to the 'snapshot' snapshot - - ==================== - Merging of snapshots - ==================== - - A) on directory level (records in SnapshotFiles) - ================================================ - - 1. certain directory exists in both snapshots: the directory still - exists in target/merged snapshot - 2. directory is contained in current snapshot but is not contained - in origin snapshot: the directory exists in target/merged snapshot - 3. directory exists in origin snapshot, but does not exist in target - snapshot: directory was removed or excluded and does not exist - in merged snapshot - - B) on level of files within directories - ======================================= - - Files must be considerated if the parent directory which contains - a certain file still exists in the target/merged snapshot. The - same relations as on directory level hold for files. - - :param snapshot: the snapshot to push in - :type snapshot: Snapshot - :param topullSnp: The snapshot to pull - :type topullSnp: Snapshot - - """ - # Details on implementation - # - # 1. create a temporary directory inside of the rebased snapshot - # 2. merge the SNAR files, this gives a list of files/directories - # to be moved from the base snapshot (to pull snp) into the - # rebased snapshot; the snar header from the destination snapshot - # (i.e. the child) is used - # 3. merge the include and exclude file lists - # - - # Utilities functions everything should be done in temporary files # - def makeTmpTAR(): - """ - How is the temporary archive created? - - 1. the list of files which need to are extracted from the base - snapshot is written to file - 2. these files are extracted from the base snapshot - 3. - - @todo: Check available disk space prior. - """ - # write temp flist created from the temporary partial snar file - flist_name = self._fop.normpath(tmpdir, "flist.tmp") - - self.logger.info("Writing the temporary Files list to make the transfer") -# print " %s" % flist_name -# print "Striping leading '/', separating entries with NULL" - - flistd = open(flist_name, 'w') - for _fnam in _files_extract: -# print _fnam - flistd.write(_fnam.lstrip(self._fop.pathsep) + '\0') - flistd.close() - - self.logger.info("Make a temporary tar file by transfering the "\ - "files from base") - tmptardir = self._fop.normpath(tmpdir, "tempTARdir") - if self._fop.path_exists(tmptardir): - self._fop.delete(tmptardir) - self._fop.makedir(tmptardir) - - # extract files that are stored in temporary flist - tar.extract2(topullSnp.getArchive(), flist_name, - tmptardir, additionalOpts = ["--no-recursion"]) - - # uncompress the tar file so that we can append files to it - archive = snapshot.getArchive() - if not tar.getArchiveType(archive): - raise SBException("Invalid archive file '%s'" % archive) - else : - arvtype = tar.getArchiveType(archive) - if arvtype == "gzip" : - Util.launch("gunzip", [archive]) - archive = archive[:-3] - elif arvtype == "bzip2" : - Util.launch("bunzip2", [archive]) - archive = archive[:-4] - # else : the archive is already uncompressed - - # finally append them to the current - # archive (resp. the temporary working copy) - # we use the flist from above - tar.appendToTarFile(desttar = archive, fileslist = flist_name, - workingdir = tmptardir + self._fop.pathsep, additionalOpts = None) - - # re-compress - if arvtype == "gzip" : - Util.launch("gzip", [archive]) - elif arvtype == "bzip2" : - Util.launch("bzip2", [archive]) - - self._fop.force_delete(tmptardir) - - def mergeIncludesList(): - destf_path = self._fop.normpath(tmpdir, "includes.list.tmp") - - srcfd = open(topullSnp.getIncludeFListFile()) - incl_topull = srcfd.readlines() - srcfd.close() - - srcfd = open(snapshot.getIncludeFListFile()) - incl_snp = srcfd.readlines() - srcfd.close() - - incl_dest = Util.list_union(incl_topull, incl_snp) - - destfd = open(destf_path, 'w') - destfd.writelines(incl_dest) - destfd.close() - - def mergeExcludesList(): - destf_path = self._fop.normpath(tmpdir, "excludes.list.tmp") - - srcfd = open(topullSnp.getExcludeFListFile()) - excl_topull = srcfd.readlines() - srcfd.close() - - srcfd = open(snapshot.getExcludeFListFile()) - excl_snp = srcfd.readlines() - srcfd.close() - - excl_dest = Util.list_union(excl_topull, excl_snp) - - destfd = open(destf_path, 'w') - destfd.writelines(excl_dest) - destfd.close() - - def movetoFinaldest(): - self.logger.debug("Move all temporary files to their final destination") - # SNAR file - _tmpname = self._fop.normpath(tmpdir, "snar.final.tmp") - if self._fop.path_exists(snapshot.getSnarFile()) : - self._fop.delete(snapshot.getSnarFile()) - self._fop.rename(_tmpname, snapshot.getSnarFile()) - - # Includes.list - if self._fop.path_exists(snapshot.getIncludeFListFile()) : - self._fop.delete(snapshot.getIncludeFListFile()) - self._fop.rename(tmpdir + self._fop.pathsep + "includes.list.tmp", - snapshot.getIncludeFListFile()) - - # Excludes.list - if self._fop.path_exists(snapshot.getIncludeFListFile()) : - self._fop.delete(snapshot.getExcludeFListFile()) - self._fop.rename(tmpdir + self._fop.pathsep + "excludes.list.tmp", - snapshot.getExcludeFListFile()) - - # process: - try : - self.statusNumber = 0.00 - - # create a temporary directory within the target snapshot - tmpdir = self._fop.joinpath(snapshot.getPath(), self.REBASEDIR) - if self._fop.path_exists(tmpdir): - self._fop.force_delete(tmpdir) # to ensure we have write permissions - self._fop.makedir(tmpdir) - - # specify full path to final (temporary) snar file - _tmpfinal = self._fop.normpath(tmpdir, "snar.final.tmp") - - # create temporary SNAR file and copy the header, then merge - finalsnar = self._copy_empty_snar(snapshot, _tmpfinal) -# _snp_excl = snapshot.read_excludeflist_from_file() -# print ">>> getExcludeFlist" -# print "%s" % _snp_excl -# assert isinstance(_snp_excl, set) - _files_extract = self._merge_snarfiles(snapshot.getSnapshotFileInfos(), - snapshot.read_excludeflist_from_file(), - topullSnp.getSnapshotFileInfos(), - finalsnar) - - self.statusNumber = 0.35 - mergeIncludesList() - - self.statusNumber = 0.45 - mergeExcludesList() - - self.statusNumber = 0.55 - makeTmpTAR() - - self.statusNumber = 0.75 - movetoFinaldest() - - # clean Temporary files - self.statusNumber = 0.85 - self._fop.delete(tmpdir) - - self.statusNumber = 0.95 - snapshot.commitverfile() - self.statusNumber = 1.00 - - self.statusNumber = None - self.statusMessage = None - self.substatusMessage = None - except Exception, _exc: - - _msg = _("An error occurred when pulling snapshot '%s'.") % \ - topullSnp.getName() - self.logger.error(_msg) - self.logger.error(str(_exc)) - self.logger.error(traceback.format_exc()) - - self.__cancelPull(snapshot) - raise _exc - def _copy_empty_snar(self, snp_source, copydest): """Creates an empty SnapshotInfo-file with the name 'copydest' from the SnapshotInfo-file contained in given source snapshot. Empty @@ -720,52 +411,6 @@ res_snpfinfo.addRecord(_final_record) return files_to_extract - def _rebaseOnLastSnp(self, snapshot): - """One step re-base: the given `snapshot` is re-based one-step - back in history, i.e. on the base of its own base snapshot. This - is the smallest possible re-base operation. If the base of the - given `snapshot` was incremental its base is set as new base - snapshot. If the father snapshot was a full dump, the re-based - `snapshot` is made to a full one. - - Re-base principle: - dependencies before re-basing: - a) snapshot (inc) - -> snpapshot's father (inc) - -> snapshot's grand-father (inc or full) - b) snapshot (inc) -> snpapshot's father (full) - - after re-basing: - a) snapshot (inc) -> snapshot's grand-father (inc or full) - b) snapshot (full) - - - :todo: Implement tests for this method! - - """ - if not snapshot.getBase(): - raise SBException(_("Base of snapshot '%s' is not set.")\ - % snapshot.getName()) - - # get the base (father) and grand-father of processed snapshot - basesnp = snapshot.getBaseSnapshot() - newbase = basesnp.getBase() - - # process the merging - self._pullSnpContent(snapshot, basesnp) - # now the snapshot does not depend on the base any longer - -#TODO: after merging snapshots: if the merged snapshot is full now, the base -# file should be renamed in the merge routine?? No! - - # set the new base - if newbase: - snapshot.setBase(newbase) - snapshot.commitbasefile() - else: - snapshot = self.__makeSnpFull(snapshot) - return snapshot - def __makeSnpFull(self, snapshot): """Make an inc snapshot to a full one. @@ -811,29 +456,6 @@ return res_snp - def __cancelPull(self, snapshot): - """To be able to handle well the cancellation of a pull - of a snapshot from another, we will need to not modify - the snapshot till the last moment. This means, the infos - we want to add in the SNAR file should be created as a - temporary SNAR file. Same goes for the TAR file. So that - to cancel, we will just have to remove those temporary - files and restore the 'ver' file. - - """ - self.logger.info(_("Cancelling pull of snapshot '%s'") % snapshot.getName()) - path = self._fop.joinpath(snapshot.getPath(), self.REBASEDIR) -# shutil.rmtree(path) - self._fop.delete(path) - - if self._fop.path_exists(self._fop.joinpath(snapshot.getPath(), "files.tar")): - format = snapshot.getFormat() - if format == "gzip": - Util.launch("gzip", [self._fop.joinpath(snapshot.getPath(), "files.tar")]) - elif format == "bzip2": - Util.launch("bzip2", [self._fop.joinpath(snapshot.getPath(), "files.tar")]) - snapshot.commitverfile() - def _retrieve_childsnps(self, snapshot): """Retrieves all snapshots that rely on the given parent `snapshot` and returns a list containing all child snapshots. @@ -875,29 +497,12 @@ """Public method that removes a given snapshot safely. The removal of a snapshot is more complicated than just to remove the snapshot directory since a snapshots could be the base of other snapshots. - We need to rebase all of these depending snapshots before removing - the given snapshot. :param snapshot: the snapshot to be removed :type snapshot: `Snapshot` - :todo: Refactor by using method `_retrieve_childsnps`! - :note; Currently removal of freestanding snapshots is supported only. """ -# _this_snp_name = snapshot.getName() -# -# self.logger.info(_("Deleting snapshot: '%(snp)s'.") % {'snp' : snapshot}) -# if snapshot.isfull(): -# self.__remove_full_snapshot(snapshot) -# else: -# # rebase all child snapshots to the base of this snapshot -# listing = self.get_snapshots(forceReload = True) -# for snp in listing: -# if snp.getBase() == _this_snp_name: -# self.rebaseSnapshot(snp, snapshot.getBaseSnapshot()) -# self._remove_standalone_snapshot(snapshot) -# listing = self.get_snapshots(forceReload = True) self._remove_standalone_snapshot(snapshot) def remove_snapshot_forced(self, snapshot): @@ -907,43 +512,6 @@ self._fop.delete(snapshot.getPath()) self.get_snapshots(forceReload = True) - - def __remove_full_snapshot(self, snapshot): - """Method that removes the given full backup snapshot. The removal of - a full anspshot is only possible if the full snapshot is not be the - base of any other snapshot. To ensure this pre-condition 2 cases - are thinkable. - - 1. The snapshot is already stand-alone, i.e. isn't the base of any other. - 2. The snapshot must be merged with any of its child snapshots and the - reference removed. - """ - _ful_snp_name = snapshot.getName() - self.logger.info("Deleting full snapshot '%(snp)s'." - % {'snp' : _ful_snp_name}) - if not snapshot.isfull(): - raise ValueError("Snapshot must be a full snapshot!") - - # rebase all childs of this snapshot - listing = self.get_snapshots(forceReload = True) - for snp in listing : - if snp.getBase() == _ful_snp_name: - self.logger.debug("Rebase child snapshot '%s'" % (snp)) - self.rebaseSnapshot(snp) - - # check if the full snapshot is no longer the base of any other - listing = self.get_snapshots(forceReload = True) - is_standalone = True - for snp in listing: - if snp.getBase() == _ful_snp_name: - is_standalone = False - break - if is_standalone: - self._remove_standalone_snapshot(snapshot) - else: - raise RemoveSnapshotHasChildsError("The removal of a full snapshot is "\ - "not possible as long as this is the base of other snapshots.") - def compareSnapshots(self, snap1, snap2): """Compare 2 snapshots and return and SBdict with the differences between their files. The format is diff -Nru sbackup-0.11.4/src/sbackup/core/snapshot.py sbackup-0.11.6/src/sbackup/core/snapshot.py --- sbackup-0.11.4/src/sbackup/core/snapshot.py 2011-02-13 18:22:21.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/core/snapshot.py 2013-09-17 20:50:00.000000000 +0200 @@ -1,6 +1,6 @@ # Simple Backup - snapshot definition # -# Copyright (c)2008-2010: Jean-Peer Lorenz +# Copyright (c)2008-2010,2013: Jean-Peer Lorenz # Copyright (c)2007-2008: Ouattara Oumar Aziz # # This program is free software; you can redistribute it and/or modify @@ -111,7 +111,9 @@ self.__validateSnapshot(self.__snapshotpath, self.__name) else : # Snapshot for creation self._fop.makedir(self.__snapshotpath) - + #LP #785512: make the snapshot directory RWX only by owner + self._fop.chmod_no_rwx_grp_oth(self.__snapshotpath) + def __str__(self): "Return the snapshot name" return self.getName() @@ -299,14 +301,6 @@ _arn = self._fop.joinpath(self.getPath(), "files.tar.gz") if self._fop.path_exists(_arn): return _arn - - elif self.getVersion() == "1.4": - self.logger.warning("The tgz name is deprecated, please upgrade Snapshot to Version 1.5") - _arn = self._fop.joinpath(self.getPath(), "files.tgz") - if self._fop.path_exists(_arn): - return _arn - else : - problem = True else : problem = True diff -Nru sbackup-0.11.4/src/sbackup/core/UpgradeManager.py sbackup-0.11.6/src/sbackup/core/UpgradeManager.py --- sbackup-0.11.4/src/sbackup/core/UpgradeManager.py 2011-02-13 18:22:21.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/core/UpgradeManager.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,417 +0,0 @@ -# Simple Backup - upgrade handling -# -# Copyright (c)2010: Jean-Peer Lorenz -# Copyright (c)2007-2008: Ouattara Oumar Aziz -# Copyright (c)2007: Aigars Mahinovs -# -# This program 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. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -""" -:mod:`UpgradeManager` --- handles upgrades of snapshots -======================================================= - -.. module:: UpgradeManager - :synopsis: handles upgrades of snapshots -.. moduleauthor:: Ouattara Oumar Aziz (alias wattazoum) -.. moduleauthor:: Aigars Mahinovs - -""" - - -from gettext import gettext as _ - -import time -import datetime -import cPickle as pickle - -from sbackup.pkginfo import Infos - -from sbackup.fs_backend import fam -from sbackup.ar_backend import tar - -from sbackup.core import SnapshotManager -from sbackup.core import snapshot as snapshot_ # due to parameters named `snapshot` - -from sbackup import util -from sbackup.util import structs -from sbackup.util import log -from sbackup.util import local_file_utils -from sbackup.util.exceptions import SBException - - -class UpgradeManager(object): - """ - The UpgradeManager class - """ - - __possibleVersion = ["1.0", "1.1", "1.2", "1.3", "1.4", "1.5"] - - statusMessage = None - substatusMessage = None - statusNumber = None - - def __init__(self): - """ - """ - self.logger = log.LogFactory.getLogger() - self._fop = fam.get_file_operations_facade_instance() - - def getStatus(self): - """ - @return: [statusNumber,statusMessage,substatusMessage] - """ - return [self.statusNumber, self.statusMessage, self.substatusMessage] - - def upgradeSnapshot(self, snapshot, version = "1.5"): - """Upgrades a snapshot to a certain version. Default version - is the highest/latest version available. - - :param snapshot: the snapshot to upgrade - :param version: default is 1.5 - - """ - - if version not in self.__possibleVersion : - raise SBException("Version should be in '%s' , got '%s' " % (str(self.__possibleVersion), str(version))) - else : - if snapshot.getVersion() >= version : - self.logger.debug("Nothing to do : version of snapshot is already higher than given version (%s >= %s )" % (snapshot.getVersion() , version)) - return - else : - self.logger.info("Upgrading snapshot '%s' to version '%s'" % (str(snapshot), str(version))) - while snapshot.getVersion() < version : - if snapshot.getVersion() < "1.2" : - if ":" in snapshot.getName(): - newname = snapshot.getName().replace(":", ".") - self.logger.info("Renaming directory: '" + snapshot.getName() + "' to '" + newname + "'") - self._fop.rename(snapshot.getPath(), newname) - snapshot = snapshot_.Snapshot(self._fop.get_dirname(snapshot.getPath()) + self._fop.pathsep + newname) - self.__upgrade_v12(snapshot) - elif snapshot.getVersion() < "1.3": - self.__upgrade_v13(snapshot) - elif snapshot.getVersion() < "1.4": - self.__upgrade_v14(snapshot) - elif snapshot.getVersion() < "1.5": - self.__upgrade_v15(snapshot) - self.statusMessage = None - self.substatusMessage = None - self.statusNumber = None - -# def downgradeSnapshot(self, snapshot, version = "1.5"): -# """Currently unused! -# -# The downgrade feature will be certainly used for exporting -# snapshots, so that it would be possible to use it with a -# previous version of sbackup. -# -# :param snapshot: the snapshot to downgrade -# :param version: The version to which one the snapshot will be downgraded -# -# """ -# self.logger.info("Downgrading snapshot '%s' to version '%s'" % (str(snapshot), str(version))) -# if version not in self.__possibleVersion : -# raise SBException("Version should be in '%s' , got '%s' " % (str(self.__possibleVersion), str(version))) -# else : -# if snapshot.getVersion() <= version : -# self.logger.info("Nothing to do : version of snapshot is already higher than given version (%s <= %s )" % (snapshot.getVersion() , version)) -# while snapshot.getVersion() > version : -# if snapshot.getVersion() > "1.4" : -# self.__downgrade_v14(snapshot) -# elif snapshot.getVersion() > "1.3" : -# self.__downgrade_v13(snapshot) -# elif snapshot.getVersion() > "1.2" : -# self.__downgrade_v12(snapshot) -# else : -# raise SBException("Downgrade to version '%s' isn't supported " % str(version)) - - def need_upgrade(self, target_path): - """Checks if there is something to upgrade. If there are snapshots - that should be upgraded True is returned otherwise False. - - """ - res = False - self.logger.info("Checking for snapshots stored in old formats") - snpman = SnapshotManager.SnapshotManager(target_path) - snps = snpman.get_snapshots_allformats() - for csnp in snps: - if csnp.getVersion() != Infos.SNPCURVERSION: - res = True - break - return res - - def upgradeAll(self, target): - """Upgrades all valid snapshots in a certain directory. - - :param target: The directory containing the snapshots - - """ - self.logger.info("Upgrading All valid snapshot in '%s'" % target) - snapman = SnapshotManager.SnapshotManager(target) - snapshots = snapman.get_snapshots_allformats() - for s in snapshots : - if s.getVersion() < Infos.SNPCURVERSION: - self.upgradeSnapshot(s) - - def __stamp(self, snppath): - _fpath = self._fop.joinpath(snppath, "upgrade") - self._fop.writetofile(_fpath, "Upgrade in progress.") - - def __unstamp(self, snppath): - _fpath = self._fop.joinpath(snppath, "upgrade") - try: - self._fop.force_delete(_fpath) - except (OSError, IOError), error: - self.logger.warning(_("Unable to remove upgrade stamp: %s") % error) - - def __upgrade_v12(self, snapshot): - """Private method that actually processes the upgrade to - version 1.2. - - """ - self.statusMessage = _("Upgrading from v1.0 to v1.2: %s") % str(snapshot) - self.logger.info(self.statusMessage) - self.__stamp(snapshot.getPath()) - i = self._fop.openfile_for_read(self._fop.joinpath(snapshot.getPath(), "tree")) - bfiles = pickle.load(i) - n = self._fop.openfile_for_write(self._fop.joinpath(snapshot.getPath(), "flist")) - p = self._fop.openfile_for_write(self._fop.joinpath(snapshot.getPath(), "fprops")) - for item in bfiles: - n.write(str(item[0]) + "\n") - p.write(str(item[1]) + str(item[2]) + str(item[3]) + str(item[4]) + str(item[5]) + "\n") - p.close() - n.close() - i.close() - self._fop.writetofile(self._fop.joinpath(snapshot.getPath(), "ver"), "1.2\n") - snapshot.setVersion("1.2") - self.__unstamp(snapshot.getPath()) - self.statusNumber = 0.40 - - def __upgrade_v13(self, snapshot): - self.statusMessage = _("Upgrading to v1.3: %s") % str(snapshot) - self.logger.info(self.statusMessage) - self.__stamp(snapshot.getPath()) - flist = self._fop.readfile(self._fop.joinpath(snapshot.getPath(), "flist")).split("\n") - fprops = self._fop.readfile(self._fop.joinpath(snapshot.getPath(), "fprops")).split("\n") - if len(flist) == len(fprops) : - if len(flist) > 1: - l = self._fop.openfile_for_write(self._fop.joinpath(snapshot.getPath(), "flist.v13")) - p = self._fop.openfile_for_write(self._fop.joinpath(snapshot.getPath(), "fprops.v13")) - for a, b in zip(flist, fprops): - l.write(a + "\000") - p.write(b + "\000") - l.close() - p.close() - self._fop.rename(self._fop.joinpath(snapshot.getPath(), "flist"), "flist.old") - self._fop.rename(self._fop.joinpath(snapshot.getPath(), "flist.v13"), "flist") - self._fop.rename(self._fop.joinpath(snapshot.getPath() , "fprops"), "fprops.old") - self._fop.rename(self._fop.joinpath(snapshot.getPath() , "fprops.v13"), "fprops") - self._fop.writetofile(self._fop.joinpath(snapshot.getPath(), "ver"), "1.3\n") - snapshot.setVersion("1.3") - else: - self._fop.delete(self._fop.joinpath(snapshot.getPath(), "ver")) - raise SBException ("Damaged backup metainfo - disabling %s" % snapshot.getPath()) - self.__unstamp(snapshot.getPath()) - self.statusNumber = 0.60 - - def __upgrade_v14(self, snapshot): - self.statusMessage = _("Upgrading to v1.4: %s") % str(snapshot) - self.logger.info(self.statusMessage) - self.__stamp(snapshot.getPath()) - - self._fop.delete(self._fop.joinpath(snapshot.getPath(), "ver")) - - if not self._fop.path_exists(self._fop.joinpath(snapshot.getPath(), "flist"))\ - or not self._fop.path_exists(self._fop.joinpath(snapshot.getPath(), "fprops"))\ - or not self._fop.path_exists(self._fop.joinpath(snapshot.getPath() , "files.tgz"))\ - or not self._fop.path_exists(self._fop.joinpath(snapshot.getPath() , "excludes")): - raise SBException("Snapshot is invalid! One of the essential files does not exist.") - self._fop.writetofile(self._fop.joinpath(snapshot.getPath(), "ver"), "1.4\n") - snapshot.setVersion("1.4") - self.__unstamp(snapshot.getPath()) - self.statusNumber = 0.80 - - def __upgrade_v15(self, snapshot): - self.statusMessage = _("Upgrading to v1.5: %s") % str(snapshot) - self.logger.info(self.statusMessage) - self.__stamp(snapshot.getPath()) - self.statusNumber = 0.80 - self._fop.delete(self._fop.joinpath(snapshot.getPath(), "ver")) - - if not self._fop.path_exists(self._fop.joinpath(snapshot.getPath(), "flist")): - raise SBException("Snapshot is invalid! The essential file 'flist' does not exist.") - if not self._fop.path_exists(self._fop.joinpath(snapshot.getPath(), "fprops")): - raise SBException("Snapshot is invalid! The essential file 'fprops' does not exist.") - if not self._fop.path_exists(self._fop.joinpath(snapshot.getPath(), "files.tgz")): - raise SBException("Snapshot is invalid! The essential file 'files.tgz' does not exist.") - if not self._fop.path_exists(self._fop.joinpath(snapshot.getPath() , "excludes")): - raise SBException("Snapshot is invalid! The essential file 'excludes' does not exist.") - - self.logger.info("renaming file.tgz to file.tar.gz") - self._fop.rename(self._fop.joinpath(snapshot.getPath(), "files.tgz"), "files.tar.gz") - self.statusNumber = 0.82 - #TODO: - self.logger.info("Creating includes.list") - flist = self._fop.joinpath(snapshot.getPath(), "flist") - fprops = self._fop.joinpath(snapshot.getPath() , "fprops") - - f1 = self._fop.openfile_for_read(flist) - f2 = self._fop.openfile_for_read(fprops) - - isEmpty = True - - for f, p in util.readlineNULSep(f1, f2): - if f : - if p is not None and p != str(None) : - if isEmpty: - isEmpty = False - snapshot.addToIncludeFlist(f) - # commit include.list - fi = self._fop.openfile_for_write(snapshot.getIncludeFListFile()) - for f in snapshot.getIncludeFlist().getEffectiveFileList() : - fi.write(str(f) + "\n") - fi.close() - - self.statusNumber = 0.85 - self.logger.info("Creating empty excludes.list") - f1 = self._fop.openfile_for_write(snapshot.getExcludeFListFile()) - f1.close() - - self.statusNumber = 0.87 - self.logger.info("Creating 'format' file") - # hardcoded format: gzip without splitting is supported by 1.4 only - formatInfos = "%s\n%s" % ("gzip", 0) - self._fop.writetofile(self._fop.joinpath(snapshot.getPath(), "format"), formatInfos) - - self.statusNumber = 0.90 - self.logger.info("Creating the SNAR file") - if self._fop.path_exists(snapshot.getSnarFile()) : - self.logger.warning(_("The SNAR file already exist for snapshot '%s'. It is not overwritten.") % str(snapshot)) - else : - snarfileinfo = snapshot.getSnapshotFileInfos(writeFlag = True) - if not isEmpty : - date = snapshot.getDate() - datet = datetime.datetime(date['year'], date['month'], date['day'], date['hour'], date['minute'], date['second']) - snarfileinfo.setHeader(datet) - - #header created, let's now add the directories from includes.list - last_parentdir = None - for f in snapshot.getIncludeFlist().getEffectiveFileList() : - if f : - - parentdir = self._fop.get_dirname(f) - if parentdir == last_parentdir : -# self.logger.debug("[LastParentDir] already processed '%s'" % parentdir) - continue - last_parentdir = parentdir - - - _time = str(int(time.mktime(datet.timetuple()))) - result = ["0", _time, _time] - - if snarfileinfo.hasPath(parentdir) : -# self.logger.debug("[SNARFileInfo] already processed '%s'" % parentdir) - continue - -# self.logger.debug("processing '%s'" % parentdir) - - if self._fop.path_exists(parentdir) : - result.append(str(local_file_utils.stat_device(parentdir))) - result.append(str(local_file_utils.stat_inode(parentdir))) - else : - result.extend(['0', '0']) - - result.append(parentdir) - -# fname = self._fop.get_basename(f) - dumpdirs = list() - - #get the parent dir content - cSBdict = snapshot.getIncludeFlist().getSon(parentdir) - for k, v in dict.iteritems(cSBdict): - # determine if it's a dir or a file - if self._fop.path_exists(self._fop.joinpath(parentdir, k)) : - if self._fop.is_dir(self._fop.joinpath(parentdir , k)) : - control = tar.Dumpdir.DIRECTORY - else : - control = tar.Dumpdir.INCLUDED - else : - if v and type(v) is list and len(v) == 2 and type(v[1]) == structs.SBdict: - # this is a dirrectory - control = tar.Dumpdir.DIRECTORY - else : - control = tar.Dumpdir.INCLUDED - - dumpdirs.append(tar.Dumpdir(control + k)) - - result.append(dumpdirs) - - snarfileinfo.addRecord(result) - - self.statusNumber = 0.97 - self.logger.info("Creating 'ver' file") - self._fop.writetofile(self._fop.joinpath(snapshot.getPath(), "ver"), "1.5\n") - snapshot.setVersion("1.5") - if self._fop.path_exists(self._fop.joinpath(snapshot.getPath(), "ver")): - self.logger.debug("'ver' file created.") - self.__unstamp(snapshot.getPath()) - self.statusNumber = 1.00 - -# def __downgrade_v12 (self, snapshot): -# self.logger.info("Downgrading to v1.2: %s" % str(snapshot)) -# flist = self._fop.readfile(snapshot.getPath() + self._fop.pathsep + "flist").split("\000") -# fprops = self._fop.readfile(snapshot.getPath() + self._fop.pathsep + "fprops").split("\000") -# -# if len(flist) == len(fprops) : -# if len(flist) > 1: -# l = self._fop.openfile(snapshot.getPath() + self._fop.pathsep + "flist.v12", True) -# p = self._fop.openfile(snapshot.getPath() + self._fop.pathsep + "fprops.v12", True) -# for a, b in zip(flist, fprops): -# l.write(a + "\n") -# p.write(b + "\n") -# l.close() -# p.close() -# self._fop.rename(snapshot.getPath() + self._fop.pathsep + "flist", "flist.old") -# self._fop.rename(snapshot.getPath() + self._fop.pathsep + "flist.v12", "flist") -# self._fop.rename(snapshot.getPath() + self._fop.pathsep + "fprops", "fprops.old") -# self._fop.rename(snapshot.getPath() + self._fop.pathsep + "fprops.v12", "fprops") -# self._fop.writetofile(snapshot.getPath() + self._fop.pathsep + "ver", "1.3\n") -# else: -# self._fop.delete(snapshot.getPath() + self._fop.pathsep + "ver") -# raise SBException ("Damaged backup metainfo - disabling %s" % snapshot.getPath()) -# self._fop.delete(snapshot.getPath() + self._fop.pathsep + "ver") -# self._fop.writetofile(snapshot.getPath() + self._fop.pathsep + "ver", "1.2\n") -# snapshot.setVersion("1.2") -# -# def __downgrade_v13(self, snapshot): -# self.logger.info("Downgrading to v1.3: %s" % str(snapshot)) -# self._fop.delete(snapshot.getPath() + self._fop.pathsep + "ver") -# self._fop.writetofile(snapshot.getPath() + self._fop.pathsep + "ver", "1.3\n") -# snapshot.setVersion("1.3") -# -# def __downgrade_v14(self, snapshot): -# if snapshot.getFormat() != "gzip" : -# raise SBException (_("Cannot downgrade other format than 'gzip' to 1.4")) -# -# self.logger.info("Downgrading to v1.4: %s" % str(snapshot)) -# self._fop.delete(snapshot.getPath() + self._fop.pathsep + "ver") -# -# self.logger.debug("renaming file.tar.gz to file.tgz") -# self._fop.rename(snapshot.getPath() + self._fop.pathsep + "files.tar.gz", snapshot.getPath() + self._fop.pathsep + "files.tgz") -# -# self.logger.debug("removing 'format' file .") -# self._fop.writetofile(snapshot.getPath() + self._fop.pathsep + "format", snapshot.getFormat()) -# -# self._fop.writetofile(snapshot.getPath() + self._fop.pathsep + "ver", "1.4\n") -# snapshot.setVersion("1.4") diff -Nru sbackup-0.11.4/src/sbackup/fs_backend/_fuse_utils.py sbackup-0.11.6/src/sbackup/fs_backend/_fuse_utils.py --- sbackup-0.11.4/src/sbackup/fs_backend/_fuse_utils.py 2011-02-13 18:22:20.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/fs_backend/_fuse_utils.py 2013-09-17 20:49:59.000000000 +0200 @@ -1,6 +1,6 @@ # Simple Backup - file access management using FUSE # -# Copyright (c)2010: Jean-Peer Lorenz +# Copyright (c)2010,2013: Jean-Peer Lorenz # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -30,10 +30,11 @@ import types from sbackup.util import local_file_utils +from sbackup.util import exceptions from sbackup.util import interfaces from sbackup.util import structs from sbackup.util import pathparse - +from sbackup.util import exceptions #TODO: move available services into FUSE plugin manager and retrieve them dynamically REMOTE_SERVICE_SFTP = 101 @@ -64,6 +65,10 @@ def __init__(self): interfaces.IOperations.__init__(self) + + @classmethod + def chmod_no_rwx_grp_oth(cls, path): + local_file_utils.chmod_no_rwx_grp_oth(path) @classmethod def path_exists(cls, path): @@ -159,9 +164,23 @@ return local_file_utils.is_link(path) @classmethod + def test_dir_access(cls, path): + try: + local_file_utils.listdir(path) + except Exception, error: + raise exceptions.FileAccessException(\ + "Unable to list directory content: %s" % error) + + @classmethod def is_dir(cls, path): return local_file_utils.is_dir(path) + @classmethod + def close_stream(cls, file_desc): + try: + file_desc.close() + except IOError, error: + raise exceptions.FileAlreadyClosedError(_("Error while closing stream: %s") % error) def get_scheme_from_service(service): if not isinstance(service, types.IntType): diff -Nru sbackup-0.11.4/src/sbackup/fs_backend/_gio_utils.py sbackup-0.11.6/src/sbackup/fs_backend/_gio_utils.py --- sbackup-0.11.4/src/sbackup/fs_backend/_gio_utils.py 2011-02-13 18:22:20.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/fs_backend/_gio_utils.py 2013-09-17 20:50:00.000000000 +0200 @@ -1,6 +1,6 @@ # Simple Backup - file access management using GIO/GVFS # -# Copyright (c)2010: Jean-Peer Lorenz +# Copyright (c)2010,2013: Jean-Peer Lorenz # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -45,7 +45,6 @@ from sbackup.util import system from sbackup.util import log - errorcodes = { gio.ERROR_ALREADY_MOUNTED : exceptions.ErrorDescription(gio.ERROR_ALREADY_MOUNTED, "ERROR_ALREADY_MOUNTED", @@ -444,14 +443,15 @@ interfaces.IOperations.__init__(self) @classmethod - def __exists(cls, gfile): - _res = gfile.query_exists() - return bool(_res) - - @classmethod def path_exists(cls, path): + # Be careful: `gfile.query_exists()' returns True even if path is not + # accessible! Nevertheless we use it here since `gfile.query_info` + # does not return required attributes from destination directories + # over ftp to check whether it is actually existing and readable. + # This caused a regression (LP #1190224) which let the backup fail. _gfileobj = gio.File(path) - return cls.__exists(_gfileobj) + _res = _gfileobj.query_exists() + return _res @classmethod def openfile_for_write(cls, path): @@ -481,7 +481,7 @@ _dest = gio.File(dest) # the source must be a file and exist - if not cls.__exists(_src): + if not cls.path_exists(src): raise IOError("Given copy source `%s` does not exist" % _src.get_parse_name()) if cls.__isfile(_src): _src, _dest = cls._prepare_copy(_src, _dest) @@ -589,6 +589,24 @@ cls._add_write_permission(_entryp, recursive = False) @classmethod + def chmod_no_rwx_grp_oth(cls, path): + """Sets write permissions for user only for + given directory or file (*not* recursive). + """ + _gfileobj = gio.File(path) + try: + _ginfo = _gfileobj.query_info(attributes = gio.FILE_ATTRIBUTE_UNIX_MODE) + _fmode = _ginfo.get_attribute_uint32(gio.FILE_ATTRIBUTE_UNIX_MODE) + _new_mode = _fmode & system.UNIX_PERM_GRPOTH_NORWX + _ginfo.set_attribute_uint32(gio.FILE_ATTRIBUTE_UNIX_MODE, _new_mode) + _gfileobj.set_attributes_from_info(_ginfo) # setting attributes directly seems broken + except gio.Error, error: + _msg = get_gio_errmsg(error, "Unable to set permissions") + _logger = log.LogFactory.getLogger() + _logger.warning(_msg) + return + + @classmethod def force_delete(cls, path): cls._add_write_permission(path, recursive = True) cls.delete(path) @@ -690,6 +708,15 @@ return _ftype @classmethod + def test_dir_access(cls, path): + _gfileobj = gio.File(path) + try: + _gfileobj.enumerate_children('standard::name') + except gio.Error, error: + raise exceptions.FileAccessException(get_gio_errmsg(error, + "Unable to list directory content")) + + @classmethod def is_dir(cls, path): _gfileobj = gio.File(path) _res = cls.__isdir(_gfileobj) @@ -828,6 +855,15 @@ _ostr.write(content) _ostr.close() + @classmethod + def close_stream(cls, file_desc): + try: + file_desc.close() + except gio.Error, error: + if error.code == gio.ERROR_CLOSED: + raise exceptions.FileAlreadyClosedError(_("Error while closing stream: %s") % error) + else: + raise exceptions.FileAccessException(get_gio_errmsg(error, _("Error while closing stream"))) def get_gio_errmsg(error, title): _msg = "%s: %s" % (title, error) diff -Nru sbackup-0.11.4/src/sbackup/legacy_restore.py sbackup-0.11.6/src/sbackup/legacy_restore.py --- sbackup-0.11.4/src/sbackup/legacy_restore.py 1970-01-01 01:00:00.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/legacy_restore.py 2013-09-17 20:50:00.000000000 +0200 @@ -0,0 +1,533 @@ +# +# sbackup - legacy support for restore operation +# +# Copyright (c)2013: Jean-Peer Lorenz +# Copyright (c)2005-2008: Aigars Mahinovs +# +# This program 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. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +import shutil +import datetime +import tempfile +import filecmp + +import sys +import os.path +import re +import threading +import time +import traceback + +import sbackup.util as Util + +# Attempt to load GTK bindings +try: + import pygtk + pygtk.require("2.0") + import gtk + import gtk.glade +except ImportError: + print "Failed to load Python GTK/Gnome bindings. Please check your Gnome installation." + sys.exit(1) +try: + import gnomevfs +except ImportError: + import gnome.vfs as gnomevfs + +from sbackup.ui import misc +sys.excepthook = misc.except_hook_threaded + + +_LEGACY_RESTOREGUI_GLADE = Util.get_resource_file('sbackup-legacy-restore.glade') + + +class SRestore: + def __init__(self): + pass + + def restore( self, backup, spath, dpath = None ): + """ + Restore one file or directory from the backup tdir with name + spath to dpath (or to its old location). + All existing files must be moved to a "*.before_restore_$time" files. + """ + + if not dpath: + dpath = spath + + # Gather spath and dpath information + if spath[0] == "/": spath = spath[1:] + (sparent, sname) = os.path.split( spath ) + if not sname: + spath = sparent + (sparent, sname) = os.path.split( sparent ) + dpath = os.path.normpath( dpath ) + (dparent, dname) = os.path.split( dpath ) + if not dname: + dpath = dparent + (dparent, dname) = os.path.split( dpath ) + + now = datetime.datetime.now().isoformat("_").replace( ":", "." ) + ver = str(gnomevfs.read_entire_file( backup+"/ver" )) + + try: + if ver[:3] == "1.4": + self.childlist = [x[1:] for x in gnomevfs.read_entire_file( backup+"/flist" ).split( "\000" ) if x == "/"+spath or x[1:len(spath)+2]==spath+"/"] + else: + print "Only snapshot version 1.4 is supported" + return False + except: + print "E: Error opening backup snapshot metadata" + return False + + if len(self.childlist) == 0: + print "E: File not found in the backup snapshot" + return False + + if os.path.exists(dpath): + if os.path.isdir(dpath): + tdir = tempfile.mkdtemp( dir=dpath ) + self.extract( backup, spath, tdir ) + for _file in self.childlist: + if len(self.childlist)==1: + bname = sname + src = os.path.join( tdir, spath ) + else: + bname = _file[len(spath)+1:] + src = os.path.join( tdir, spath, bname ) + dst = os.path.join( dpath, bname ) + if os.path.isdir(src): + if not os.path.exists(dst): + os.makedirs(dst) + srcstat = os.stat( src ) + os.chown( dst, srcstat.st_uid, srcstat.st_gid ) + os.chmod( dst, srcstat.st_mode ) + elif os.path.isfile(src) or os.path.islink(src): + if os.path.exists(dst) and not filecmp.cmp(src, dst): + shutil.move( dst, dst+".before_restore_"+now ) + if not os.path.exists(dst): + shutil.move( src, dst ) + else: + print "W: Path '%s' is neither directory nor file! Skipped." % src + shutil.rmtree( tdir ) + else: + tdir = tempfile.mkdtemp( dir=dparent ) + self.extract( backup, spath, tdir ) + shutil.move( dpath, dpath+".before_restore_"+now ) + shutil.move( os.path.join(tdir,spath), dpath ) + shutil.rmtree( tdir ) + + else: + tdir = tempfile.mkdtemp( dir=dparent ) + self.extract( backup, spath, tdir ) + shutil.move( os.path.join(tdir,spath), dpath ) + shutil.rmtree( tdir ) + + return True + + def islocal( self, uri ): + local = True + try: + if not gnomevfs.URI( uri ).is_local: + local = False + except: + pass + return local + + def extract( self, backup, spath, tdir ): + tarline = "tar -xzp --occurrence=1 --ignore-failed-read -C '"+tdir+"' " + if self.islocal( backup ): + tarline += " -f '"+backup+"/files.tgz' '"+spath+"' >/dev/null 2>&1" + os.system( tarline ) + else: + tarline += "'"+spath+"' 2>/dev/null" + tsrc = gnomevfs.open( backup+"/files.tgz", 1) + tdst = os.popen( tarline, "w" ) + try: shutil.copyfileobj( tsrc, tdst, 100*1024 ) + except gnomevfs.EOFError: pass + tdst.close() + tsrc.close() + + +class SRestoreGTK: + """ + Main GUI application class. + """ + + default_target = "/var/backup" + target = default_target + versions = [] + + + def __init__(self): + """ + Initializes the application. + """ + + # Setup glade and signals + gtk.glade.textdomain("sbackup") + self.signals = {"gtk_main_quit": gtk.main_quit, + "on_customsrc_toggled": self.enable_custom, + "on_treeview1_row_expanded": self.on_expand_row, + "on_backup_changed": self.on_backup_changed, + "on_apply_clicked": self.on_custom_apply, + "on_move_cursor":self.on_selection_change, + "on_restore":self.restore, + "on_restore_as":self.restore_as, + "on_customFolderButton_clicked": self.on_customFolderButton_clicked + } + + self.widgets = gtk.glade.XML(_LEGACY_RESTOREGUI_GLADE) + + self.widgets.signal_autoconnect(self.signals) + + # Get handle to window + self.window = self.widgets.get_widget("restore") + + self.widgets.get_widget("labelDefaultSource").set_text(self.default_target) + + # Load the backup tree from the default location + self.init_tree() + self.sel = self.flist_widget.get_selection() + self.sel.set_mode( gtk.SELECTION_SINGLE ) + self.load_tree(self.default_target) + + gtk.gdk.threads_init() + # Start the main loop + gtk.main() + + def init_tree(self): + """ + Initalizes the tree structure + """ + + self.flist_widget = self.widgets.get_widget("treeview1") + self.treestore = gtk.TreeStore( str ) + + self.flist_widget.set_model( self.treestore ) + + acolumn = gtk.TreeViewColumn( "Path", gtk.CellRendererText(), text=0 ) + self.flist_widget.append_column( acolumn ) + + blist_widget = self.widgets.get_widget( "combobox1" ) + self.blist = gtk.ListStore(str) + blist_widget.set_model( self.blist ) + cell = gtk.CellRendererText() + blist_widget.pack_start( cell, True ) + blist_widget.add_attribute( cell, "text", 0) + + + def load_tree(self, target): + """ + Loads the tree information from the target backup directory + """ + self.treestore.clear() + + # Checking if the target directory is local or remote + local = True + try: + if gnomevfs.URI( target ).is_local: + target = gnomevfs.get_local_path_from_uri( target ) + else: + local = False + except: + pass + + self.local = local + self.target = target + + # Checking if it is a readable directory + if local: + if not (os.path.exists( target ) and os.path.isdir( target ) and os.access( target, os.R_OK | os.X_OK ) ): + self.treestore.append( None, ["Error: backups directory does not exist!"]) + self.target = False + else: + if not (gnomevfs.exists( target ) and gnomevfs.get_file_info(target).type == 2): + self.treestore.append( None, ["Error: backups directory does not exist!"]) + self.target = False + + # Get list of backup directories + r = re.compile(r"^(\d{4})-(\d{2})-(\d{2})_(\d{2})[\:\.](\d{2})[\:\.](\d{2})\.\d+\..*?\.(.+)$") + + listing = [] + + if local and self.target: + listing = os.listdir( target ) + listing = filter( r.search, listing ) + elif self.target: + try: + d = gnomevfs.open_directory( target ) + listing = [] + for f in d: + if f.type == 2 and f.name != "." and f.name != ".." and r.search( f.name ): + listing.append( f.name ) + except: pass + + # Check if these directories are complete and remove from the list those that are not + for adir in listing[:]: + if not gnomevfs.exists(self.target+"/"+adir+"/ver") : + listing.remove( adir ) + continue + else : + if str(gnomevfs.read_entire_file( self.target+"/"+adir+"/ver"))[:3] != "1.4": + listing.remove( adir ) + continue + + listing.sort() + listing.reverse() + + self.vtree = {} + + if listing == []: + self.treestore.append( None, ["Error: no backups found in the target directory"]) + self.target = False + else: + for base in listing: + if str(gnomevfs.read_entire_file(target+"/"+base+"/ver"))[:3] == "1.4": + self.vtree[base] = str(gnomevfs.read_entire_file(target+"/"+base+"/flist")).split("\000") + else: + self.vtree[base] = str(gnomevfs.read_entire_file(target+"/"+base+"/flist")).split("\n") + + self.blist.clear() + + for base in listing: + self.blist.append( [base] ) + + self.good = False + self.on_selection_change() + if self.target: + self.treestore.append( None, ["Select any of the available backups to see list of files that can be restored."]) + + def on_customFolderButton_clicked(self, *args): + dialog = gtk.FileChooserDialog("Choose a source folder", None, gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK)) + dialog.set_default_response(gtk.RESPONSE_OK) + dialog.set_local_only(False) + if dialog.run() == gtk.RESPONSE_OK: + self.widgets.get_widget("entry1").set_text(dialog.get_uri()) + dialog.destroy() + + def enable_custom(self, *args): + """ + Enables/Disables input box for the custom backup dir + Reloads default dir on disabling + """ + if self.widgets.get_widget("radiobutton2").get_active(): + self.widgets.get_widget("entry1").set_sensitive(True) + self.widgets.get_widget("customFolderButton").set_sensitive(True) + self.widgets.get_widget("button7").set_sensitive(True) + self.widgets.get_widget("labelDefaultSource").set_sensitive(False) + else: + self.widgets.get_widget("entry1").set_sensitive(False) + self.widgets.get_widget("customFolderButton").set_sensitive(False) + self.widgets.get_widget("button7").set_sensitive(False) + self.widgets.get_widget("labelDefaultSource").set_sensitive(True) + self.load_tree(self.default_target) + + def on_backup_changed( self, combox ): + """ + Reset the file tree view. + """ + self.treestore.clear() + self.treestore.append( None, ["dummy"]) + self.show_dir( "", None ) + + def on_expand_row( self, tv, aiter, path, user_data=None): + """ + When a row in the file tree view is expanded, we populate + it with children (unless they are there already). + """ + if self.treestore.iter_nth_child( aiter, 1 ): + return + self.show_dir( self.path_to_dir(path), aiter ) + + def path_to_dir( self, path ): + """ + Recievs path in the treestore (as tuple) and returns a directory + path as string. + """ + g = list(path) + p = "" + while g != []: + i = self.treestore.get_iter( tuple(g) ) + p = "/" + self.treestore.get_value( i, 0 ) + p + g = g[:-1] + return p + + def show_dir(self, path, rootiter): + """ + Worker function - adds all files/directories from the filez list + to the treestore at the rootiter. + """ + dummy = self.treestore.iter_children(rootiter) + + self.good = True + + base = self.get_active_text(self.widgets.get_widget("combobox1")) + list2 = [] + list3 = [] + + escapedFullPath = re.escape(path)+"/([^/]+/?)" + for item in self.vtree[base]: + m = re.match( escapedFullPath, item ) + if m and not list2.count(m.group(1)) and not list3.count(m.group(1)[:-1]): + if m.group(1)[-1] == "/": + if list2.count(m.group(1)[:-1]): + list2.remove(m.group(1)[:-1]) + list3.append(m.group(1)[:-1]) + else: + list2.append( m.group(1) ) + for d in list3: + aiter = self.treestore.append( rootiter, [d] ) + self.treestore.append( aiter, ["Loading ..."] ) + for f in list2: + self.treestore.append( rootiter, [f] ) + + self.treestore.remove( dummy ) + + def get_active_text(self, combobox): + model = combobox.get_model() + active = combobox.get_active() + if active < 0: + return None + return model[active][0] + + def on_custom_apply(self, *args): + """ + Reload all backup info from a custom location + """ + + self.load_tree(self.widgets.get_widget("entry1").get_text()) + + def on_selection_change(self, *args): + """ + Enable/disable restore buttons as selection changes + """ + (model, aiter) = self.sel.get_selected() + if aiter and self.good: + self.widgets.get_widget("button2").set_sensitive(True) + self.widgets.get_widget("button3").set_sensitive(True) + else: + self.widgets.get_widget("button2").set_sensitive(False) + self.widgets.get_widget("button3").set_sensitive(False) + + def _restore_init( self, *args): + """ + Internal function to prepare for restorin a file + """ + (store, aiter) = self.widgets.get_widget("treeview1").get_selection().get_selected() + self.src = self.path_to_dir( store.get_path( aiter ) ) + return aiter + + def _do_restore( self, src, dst): + """ Internal function to ask for confirmation and call the real restore library func""" + dialog = gtk.MessageDialog(parent=None, flags=0, + type=gtk.MESSAGE_QUESTION, buttons=gtk.BUTTONS_YES_NO, + message_format="Do you really want to restore backuped copy of '%s' to '%s' ?" % (src, dst)) + response = dialog.run() + dialog.destroy() + if response == gtk.RESPONSE_YES: + while gtk.events_pending(): + gtk.main_iteration(False) + dialog = self.widgets.get_widget("restore_progress_dialog") + dialog.show() + + progressBar = self.widgets.get_widget("progressbar") + progressThread = ProgressThread(dialog, progressBar) + progressThread.setDaemon(True) + progressThread.start() + tdir = self.target+"/"+self.get_active_text(self.widgets.get_widget("combobox1")) + self.restoreThread = RestoreThread(tdir, src, dst, progressThread) + self.restoreThread.setDaemon(True) + self.restoreThread.start() + + def restore( self, *args): + """ Restore selected path to its original location""" + self._restore_init() + self._do_restore( self.src, self.src ) + + def restore_as( self, *args): + """ Restore selected path to a specific location""" + aiter = self._restore_init() + if self.treestore.iter_children( aiter ): + # is a directory + dialog = gtk.FileChooserDialog(title="Select restore location", + action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, + buttons=(gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL, + gtk.STOCK_OPEN,gtk.RESPONSE_OK)) + dialog.set_filename( self.src ) + result = dialog.run() + filename = dialog.get_filename() + dialog.destroy() + + if result == gtk.RESPONSE_OK: + self._do_restore( self.src, filename ) + else: + dialog = gtk.FileChooserDialog(title="Select restore location", + action=gtk.FILE_CHOOSER_ACTION_SAVE, + buttons=(gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL, + gtk.STOCK_OPEN,gtk.RESPONSE_OK)) + dialog.set_filename( self.src ) + dialog.set_current_name( self.src ) + result = dialog.run() + filename = dialog.get_filename() + dialog.destroy() + + if result == gtk.RESPONSE_OK: + self._do_restore( self.src, filename ) + + +class RestoreThread(threading.Thread): + + def __init__(self, tdir, src, dst, progressThread): + threading.Thread.__init__(self) + self.tdir = tdir + self.src = src + self.dst = dst + self.alive = True + self.progressThread = progressThread + + def run(self): + try: + r = SRestore() + r.restore( self.tdir, self.src, self.dst ) + del r + except: + _exc = traceback.format_exc() + misc.show_errdialog_threaded(message_str = "An uncaught error "\ + "occurred. Close this message window and restart the "\ + "application.\n\nPlease report this error on "\ + "https://bugs.launchpad.net/sbackup.", + parent = None, + headline_str = "Sorry, this should not have happened", + secmsg_str = _exc) + self.alive = False + self.progressThread.cancel = True + + +class ProgressThread(threading.Thread): + + def __init__(self, dialog, progressBar): + threading.Thread.__init__(self) + self.dialog = dialog + self.progressBar = progressBar + self.cancel = False + + def run(self): + while not self.cancel: + self.progressBar.pulse() + time.sleep(0.5) + + self.dialog.destroy() diff -Nru sbackup-0.11.4/src/sbackup/pkginfo.py sbackup-0.11.6/src/sbackup/pkginfo.py --- sbackup-0.11.4/src/sbackup/pkginfo.py 2011-02-13 18:22:20.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/pkginfo.py 2013-09-17 20:50:00.000000000 +0200 @@ -1,6 +1,8 @@ +# This Python file uses the following encoding: utf-8 +# # Simple Backup - package info # -# Copyright (c)2010: Jean-Peer Lorenz +# Copyright (c)2010,2013: Jean-Peer Lorenz # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -39,21 +41,36 @@ VERSION = util.get_version_number() DESCRIPTION = _("This is a user friendly backup solution for common desktop needs. If you want to help by submitting bugs, by translating or anything else please visit our website.") WEBSITE = "https://launchpad.net/sbackup/" - COPYRIGHT = "2005-2011 The Simple Backup authors" + COPYRIGHT = "2005-2013 The Simple Backup authors" AUTHORS = [_("Maintainers:"), "Jean-Peer Lorenz ", "Oumar Aziz Ouattara ", "", _("Former maintainers:"), - "Aigars Mahinovs ", - "Jonh Wendell ", + "Aigars Mahinovs", + "Jonh Wendell", "", _("Contributors:"), - "Martin Schaaf ", + "Martin Schaaf", "Florian Achleitner", - "Andreas Sliwka " + "Andreas Sliwka", + "Rogach (platon7pronko)", + "Felix Griewald (tiiunder)", + "Marc Deslauriers", + "Thibault Godouet", + "Anton Feenstra", + "Derek Ditch", + "Bernd Wurst", + "Simon Déziel", + "drakosha", + "bytebybyte", + "Marcel Stimberg", + "Oliver Gerlich" ] - TRANSLATORS = _("translator-credits") + TRANSLATORS = "\n".join([_("translator-credits"), + "", + "Japanese translation: Thanks to Hajime Mizuno" + ]) #TODO: remove snapshot version from here! diff -Nru sbackup-0.11.4/src/sbackup/ui/configgui.py sbackup-0.11.6/src/sbackup/ui/configgui.py --- sbackup-0.11.4/src/sbackup/ui/configgui.py 2011-02-13 18:22:19.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/ui/configgui.py 2013-09-17 20:49:59.000000000 +0200 @@ -155,10 +155,6 @@ self.ex_ftypetv.append_column(column3) self.ex_ftypetv.append_column(column2) - # set label of default target - _default_target = str(self.configman.get_target_default()) - self.widgets['label_default_target'].set_text(_default_target) - self.ex_regex = gtk.ListStore(str) self.ex_regextv = self.widgets["ex_regextv"] self.ex_regextv.set_model(self.ex_regex) @@ -198,6 +194,9 @@ values = fam.get_remote_services_avail()) self._fill_widgets_from_config(probe_fs = True) + + self.xml.signal_autoconnect(self.cb_dict) + def isConfigChanged(self, force_the_change = False): """Checks whether the current configuration has changed compared to @@ -384,7 +383,7 @@ self.configman.set_logdir(_default_config.get_logdir()) self.configman.set_logfile_templ_to_config() - loglevel = self.configman.get("log", "level") + loglevel = str(self.configman.get("log", "level")) # LP #1159705 valid_levels = ConfigManagerStaticData.get_valid_loglevels() selection = valid_levels[loglevel][1] self.widgets["loglevelcombobox"].set_active(selection) @@ -519,53 +518,39 @@ int(self.configman.get("general", "splitsize")) / 1024) self.widgets["splitsizeCB"].set_active(0) + def __dest_from_config_helper(self): + """Creates and returns a TargetHandlerInstance with set + destination path as stored/set in ConfigurationManager. + """ + if self.__destination_uri_obj is None: + self.__destination_uri_obj = pathparse.UriParser() + + self.__destination_uri_obj.set_and_parse_uri(uri = self.configman.get_destination_path()) + _dest = fam.get_fam_target_handler_facade_instance() + _dest.set_destination(self.__destination_uri_obj.uri) + return _dest + def __fill_destination_widgets(self): """Helper method which fills the UI widgets related to the backup target (i.e. destination). - - :todo: Improve! """ - dest_obj = pathparse.UriParser() - dest_obj.set_and_parse_uri(uri = self.configman.get_destination_path()) - self.__destination_uri_obj = dest_obj - - _dest = fam.get_fam_target_handler_facade_instance() - _dest.set_destination(dest_obj.uri) - -# if _dest is not None: + _dest = self.__dest_from_config_helper() ctarget = _dest.query_dest_display_name() self.logger.debug("Current destination: %s" % ctarget) if _dest.is_local(): - if self.__is_target_set_to_default(ctarget): - self.__set_target_option("default") - - else: - if not _dest.dest_path_exists(): - self.__set_config_target_to_default() - self.__set_target_option("default") - - _sec_msg = _("Please make sure the missing directory exists (e.g. by mounting an external disk) or change the specified target to an existing one.") - _message_str = _("Backup target `%s` does not exist.\n\nAttention: The target will be set to the default value. Check this on the destination settings page before saving the configuration.") % ctarget - _headline_str = \ - _("Unable to open backup target") - - gobject.idle_add(misc.show_errdialog, - _message_str, - self.__get_application_widget(), - _headline_str, _sec_msg) - return - - self.__set_target_option("local") - self.__set_target_value("local", ctarget) - + self.__set_target_label("local", ctarget) + if not _dest.dest_path_exists(): + _sec = _("A common mistake is a not mounted external disk.") + _msg = _("Backup destination folder `%s` does not exist.\n\nPlease make "\ + "sure the missing directory exists and check your settings on the "\ + "destination settings page.") % ctarget + _hdl = _("Unable to open backup destination") + gobject.idle_add(misc.show_errdialog, _msg, + self.__get_application_widget(), + _hdl, _sec) else: - self.__set_target_option("remote") - self.__set_target_value("remote", ctarget) -# else: -# # target set to default if no config option exists -# self.__set_config_target_to_default() -# self.__set_target_option("default") + self.__set_target_label("remote", ctarget) def _fill_widgets_from_config(self, probe_fs): """Prefill the GTK window with config infos. @@ -654,17 +639,12 @@ enabled/disabled/set according to the given option. Unusable widgets are automatically disabled. """ - def __enable_default_target(enable = True): - """The widgets within the 'Destination' page are - enabled/disabled/set according to default setting. - """ - pass - def __enable_local_target(enable = True): """The widgets within the 'Destination' page are enabled/disabled/set according to the given local target directory. """ - self.widgets["dest_localpath"].set_sensitive(enable) + self.widgets["dest_local"].set_sensitive(enable) + self.widgets["btn_browse_local"].set_sensitive(enable) def __enable_remote_target(enable = True): """The widgets within the 'Destination' page are @@ -674,53 +654,33 @@ self.widgets["dest_remote"].set_sensitive(enable) self.widgets["btn_set_remote"].set_sensitive(enable) - if option == "default": - __enable_default_target(enable = True) - __enable_local_target(enable = False) - __enable_remote_target(enable = False) - elif option == "local": - __enable_default_target(enable = False) + if option == "local": __enable_local_target(enable = True) __enable_remote_target(enable = False) elif option == "remote": - __enable_default_target(enable = False) __enable_local_target(enable = False) __enable_remote_target(enable = True) else: raise ValueError("Unknown target option given.") - def __set_target_option(self, option): - """Selects resp. sets the given choice for backup target. Possible - values are 'default', 'local', and 'remote'. + def __set_target_label(self, option, value): + """Selects resp. sets the given choice for backup target. + Valid options are 'local' and 'remote'. """ self.__enable_target_option(option) twidget = None - if option == "default": - twidget = self.widgets["dest1"] - elif option == "local": + if option == "local": twidget = self.widgets["dest2"] + label = self.widgets["dest_local"] elif option == "remote": twidget = self.widgets["dest3"] + label = self.widgets["dest_remote"] else: raise ValueError("Unknown target option given.") + label.set_text(value) twidget.set_active(True) twidget.grab_focus() - def __set_target_value(self, option, value): - """Sets the destination widget according to the given option. Valid - options are: 'default', 'local', and 'remote'. In the case of the - default option, the given value is ignored (since the default - is used). - """ - if option == "default": - pass - elif option == "local": - self.widgets["dest_localpath"].set_current_folder(value) - elif option == "remote": - self.widgets["dest_remote"].set_text(value) - else: - raise ValueError("Unknown target option given.") - def already_inc (self, configlist, toInclude): """configlist is like self.conf.items( "dirconfig" ) @@ -878,8 +838,6 @@ if _full_bak is True: _cmd.append("--full") - print _cmd - _env = None if system.is_superuser(): _env = {} # clear environment @@ -979,7 +937,7 @@ if response == gtk.RESPONSE_OK: _file = _prepare_filename(dialog.get_filename()) _enc_file = _escape_path(_file) - if not self.already_inc(self.configman.items("dirconfig"), _enc_file): + if not self.already_inc(self.configman.items("dirconfig", raw = True), _enc_file): self.include.append([_file]) self.configman.set("dirconfig", _enc_file, "1") self.isConfigChanged() @@ -1002,7 +960,7 @@ if response == gtk.RESPONSE_OK: _dir = _prepare_dirname(dialog.get_filename()) _enc_dir = _escape_path(_dir) - if not self.already_inc(self.configman.items("dirconfig"), _enc_dir): + if not self.already_inc(self.configman.items("dirconfig", raw = True), _enc_dir): self.include.append([_dir]) self.configman.set("dirconfig", _enc_dir, "1") self.isConfigChanged() @@ -1034,7 +992,7 @@ if response == gtk.RESPONSE_OK: _file = _prepare_filename(dialog.get_filename()) _enc_file = _escape_path(_file) - if not self.already_inc(self.configman.items("dirconfig"), _enc_file): + if not self.already_inc(self.configman.items("dirconfig", raw = True), _enc_file): self.ex_paths.append([_file]) self.configman.set("dirconfig", _enc_file, "0") self.isConfigChanged() @@ -1053,7 +1011,7 @@ if response == gtk.RESPONSE_OK: _dir = _prepare_dirname(dialog.get_filename()) _enc_dir = _escape_path(_dir) - if not self.already_ex(self.configman.items("dirconfig"), _enc_dir): + if not self.already_ex(self.configman.items("dirconfig", raw = True), _enc_dir): self.ex_paths.append([_dir]) self.configman.set("dirconfig", _enc_dir, "0") self.isConfigChanged() @@ -1068,46 +1026,18 @@ self.isConfigChanged() store.remove(iter) - def __is_target_set_to_default(self, atarget): - """Checks if the given target directory is equal to the - default settings. - - @rtype: Boolean - - @todo: Use functions from ConfigManager to proceed the check in - a consistent manner. - """ - _reslt = False - _def_target = self.configman.get_target_default() - if (os.getuid() == 0 and atarget == _def_target) or\ - (os.getuid() != 0 and atarget == _def_target): - _reslt = True - return _reslt - - def __set_config_target_to_default(self): - """The target option within the configuration is set to the defaults. - - @todo: We must ensure the default paths really do exist. - """ - self.configman.set_target_to_default() - self.isConfigChanged() - - def on_dest1_toggled(self, *args): - if self.widgets["dest1"].get_active(): - self.__enable_target_option("default") - self.widgets["dest_unusable"].hide() - self.__set_config_target_to_default() - - elif self.widgets["dest2"].get_active(): + def on_dest_toggled(self, *args): + if self.widgets["dest2"].get_active(): self.__enable_target_option("local") - self.on_dest_localpath_selection_changed() elif self.widgets["dest3"].get_active(): self.__enable_target_option("remote") - if self.__destination_uri_obj is not None: - _uri = self.__destination_uri_obj.uri - self.configman.set("general", "target", _uri) - self.isConfigChanged() + + # set changed path to destination + if self.__destination_uri_obj is not None: + _uri = self.__destination_uri_obj.uri + self.configman.set("general", "target", _uri) + self.isConfigChanged() else: raise ValueError("Unexpected widget was toggled.") @@ -1530,21 +1460,50 @@ self.configman.remove_option("general", "followlinks") self.isConfigChanged() - def on_dest_localpath_selection_changed(self, *args): #IGNORE:W0613 - """ - @todo: Check of accessibility should not take place in the UI. - """ - _locp_widg = self.widgets["dest_localpath"] - _target = _locp_widg.get_filename() + def on_btn_browse_local_clicked(self, *args): #IGNORE:W0613 + _dest = self.__dest_from_config_helper() + ctarget = _dest.query_dest_display_name() + + self.logger.debug("Current destination: %s" % ctarget) + self.widgets["dialog_browse_localdest"].set_current_folder(ctarget) + gobject.idle_add(self.__browse_localdest) - _locp_widg.set_tooltip_text(_target) + def __browse_localdest(self): + dialog = self.widgets["dialog_browse_localdest"] + dialog.set_transient_for(self.__get_application_widget()) + response = dialog.run() + + if response == gtk.RESPONSE_APPLY: + dialog.hide() + _target = dialog.get_filename() + if _target is None: # LP #1174124 Catch invalid selections + _target = "" + + if not (os.path.isdir(_target) and \ + os.access(_target, os.R_OK | os.W_OK | os.X_OK)): + _sec_msg = _("Please make sure the directory exists "\ + "and check file permissions. Then try again.") + _message_str = _("Selected backup destination folder"\ + "`%s` does not exist or is not accessable.") % _target + _headline_str = \ + _("Unable to access selected folder") + gobject.idle_add(misc.show_errdialog, + _message_str, + self.__get_application_widget(), + _headline_str, _sec_msg) + else: + self.widgets['dest_local'].set_text(_target) + self.configman.set("general", "target", _target) + _dest = self.__dest_from_config_helper() + self.isConfigChanged() + + elif response in (gtk.RESPONSE_NONE, gtk.RESPONSE_CANCEL, + gtk.RESPONSE_DELETE_EVENT): + dialog.hide() - if (os.path.isdir(_target) and os.access(_target, os.R_OK | os.W_OK | os.X_OK)): - self.configman.set("general", "target", _target) - self.isConfigChanged() - self.widgets["dest_unusable"].hide() else: - self.widgets["dest_unusable"].show() + self.logger.error(_("Unexpected dialog response: %s") % response) + gobject.idle_add(self.__browse_localdest) def on_checkbtn_show_password_toggled(self, *args): #IGNORE:W0613 self.__set_entry_remote_pass_visibiliy() @@ -1562,7 +1521,6 @@ def __show_connect_remote_dialog(self): dialog = self.widgets["dialog_connect_remote"] -# btn_cancel = self.widgets['btn_cancel_remote'] btn_connect = self.widgets['btn_connect_remote'] _server_e = self.widgets['entry_set_remote_server'] diff -Nru sbackup-0.11.4/src/sbackup/ui/GladeGnomeApp.py sbackup-0.11.6/src/sbackup/ui/GladeGnomeApp.py --- sbackup-0.11.4/src/sbackup/ui/GladeGnomeApp.py 2011-02-13 18:22:19.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/ui/GladeGnomeApp.py 2013-09-17 20:49:59.000000000 +0200 @@ -89,11 +89,10 @@ fname = search_file(filename, search_path) self.xml = gtk.glade.XML(fname, domain = 'sbackup') - # connect callbacks + # prepare callbacks self.cb_dict = {} for f in handlers: self.cb_dict[f] = getattr(self, f) - self.xml.signal_autoconnect(self.cb_dict) self.widgets = {} for w in self.widget_list: diff -Nru sbackup-0.11.4/src/sbackup/ui/gtk_rsrc.py sbackup-0.11.6/src/sbackup/ui/gtk_rsrc.py --- sbackup-0.11.4/src/sbackup/ui/gtk_rsrc.py 2011-02-13 18:22:19.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/ui/gtk_rsrc.py 2013-09-17 20:49:59.000000000 +0200 @@ -1,6 +1,6 @@ # Simple Backup - GTK+ GUI resources # -# Copyright (c)2010: Jean-Peer Lorenz +# Copyright (c)2010,2013: Jean-Peer Lorenz # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -103,15 +103,13 @@ 'ex_max', 'ex_maxsize', 'vbox_destination_page', - 'dest1', 'dest2', - 'label_default_target', 'hbox9', - 'dest_localpath', + 'dest_local', + 'btn_browse_local', 'dest3', 'hbox10', 'dest_remote', -# 'dest_remotetest', 'dest_remote_light', 'hbox11', 'dest_unusable', @@ -210,7 +208,8 @@ 'dialog_make_backup', 'checkbtn_make_backup_full', 'btn_make_backup', - 'btn_cancel_make_backup' + 'btn_cancel_make_backup', + 'dialog_browse_localdest' ] return widget_list @@ -244,8 +243,8 @@ 'on_ex_delregex_clicked', 'on_ex_max_toggled', 'on_ex_maxsize_changed', - 'on_dest1_toggled', - 'on_dest_localpath_selection_changed', + 'on_dest_toggled', + 'on_btn_browse_local_clicked', # connect to remote host 'on_btn_set_remote_clicked', 'on_cmb_set_remote_service_changed', @@ -316,11 +315,7 @@ 'restoreas', 'revert', 'revertas', - 'upgradeBox', - 'upgradeButton', - 'RebaseBox', 'txt_current_base', - 'rebaseButton', 'deleteBox', 'deleteButton', 'snphistoryFrame', @@ -352,8 +347,6 @@ 'on_revertas_clicked', 'on_restoreExpander_activate', 'on_snpmanExpander_activate', - 'on_upgradeButton_clicked', - 'on_rebaseButton_toggled', 'on_deleteButton_clicked', 'on_exportmanExpander_activate' ] diff -Nru sbackup-0.11.4/src/sbackup/ui/indicator_core.py sbackup-0.11.6/src/sbackup/ui/indicator_core.py --- sbackup-0.11.4/src/sbackup/ui/indicator_core.py 2011-02-13 18:22:19.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/ui/indicator_core.py 2013-09-17 20:49:59.000000000 +0200 @@ -1,7 +1,7 @@ # Simple Backup - Indicator application (status icon) # core implementation # -# Copyright (c)2009-2010: Jean-Peer Lorenz +# Copyright (c)2009-2010,2012,2013: Jean-Peer Lorenz # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -138,7 +138,9 @@ if isinstance(self.__notif, self.__pynotif_mod.Notification): try: if self.__trayicon is not None: - self.__notif.attach_to_status_icon(self.__trayicon) + try: + self.__notif.attach_to_status_icon(self.__trayicon) + except AttributeError: pass self.__notif.set_urgency(self.__pynotif_mod.URGENCY_LOW) self.__notif.show() except gobject.GError, exc: @@ -181,7 +183,9 @@ if isinstance(notif, self.__pynotif_mod.Notification): try: if self.__trayicon is not None: - notif.attach_to_status_icon(self.__trayicon) + try: + notif.attach_to_status_icon(self.__trayicon) + except AttributeError: pass if mode == "critical": notif.set_urgency(self.__pynotif_mod.URGENCY_CRITICAL) @@ -532,8 +536,6 @@ self._set_menuitems_status_canceled() self._set_cancel_sensitive(sensitive = False) - elif event == 'needupgrade': - msg = _("There are snapshots with old snapshot format. Please upgrade these using the Restoration tool if you want to use them.") else: self.logger.warning(_("Unknown D-Bus event `%s` received.") % (event)) diff -Nru sbackup-0.11.4/src/sbackup/ui/indicator.py sbackup-0.11.6/src/sbackup/ui/indicator.py --- sbackup-0.11.4/src/sbackup/ui/indicator.py 2011-02-13 18:22:19.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/ui/indicator.py 2013-09-17 20:49:59.000000000 +0200 @@ -19,7 +19,7 @@ # import sys -import appindicator +import appindicator #@UnresolvedImport from sbackup import util diff -Nru sbackup-0.11.4/src/sbackup/ui/restoregui.py sbackup-0.11.6/src/sbackup/ui/restoregui.py --- sbackup-0.11.4/src/sbackup/ui/restoregui.py 2011-02-13 18:22:19.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/ui/restoregui.py 2013-09-17 20:49:59.000000000 +0200 @@ -1,6 +1,6 @@ # Simple Backup - Restoration GUI in GTK+ # -# Copyright (c)2008-2010: Jean-Peer Lorenz +# Copyright (c)2008-2010,2013: Jean-Peer Lorenz # Copyright (c)2007-2008: Ouattara Oumar Aziz # # This program is free software; you can redistribute it and/or modify @@ -17,6 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # +from sbackup.util.exceptions import NotSupportedError """ :mod:`SBRestoreGTK` --- Restoration GUI in GTK+ ================================================ @@ -49,7 +50,6 @@ from sbackup.core.ConfigManager import ConfigManager, ConfigurationFileHandler from sbackup.core.SnapshotManager import SnapshotManager from sbackup.core.RestoreManager import RestoreManager -from sbackup.core.UpgradeManager import UpgradeManager from sbackup.util.log import LogFactory import sbackup.ar_backend.tar as TAR from sbackup.pkginfo import Infos @@ -611,7 +611,7 @@ if iter: self.currentSnp = self.snpman.get_snapshot_allformats(str(tstore.get_value(iter, 0))) if self.currentSnp.getVersion() != Infos.SNPCURVERSION: - message = _("Snapshot version is not supported (Only %(supportedversion)s is supported). Version '%(currentversion)s' found. You should upgrade it. ") % {'supportedversion': Infos.SNPCURVERSION, 'currentversion':self.currentSnp.getVersion() } + message = _("Snapshot version is not supported (Only %(supportedversion)s is supported). Version '%(currentversion)s' found.") % {'supportedversion': Infos.SNPCURVERSION, 'currentversion':self.currentSnp.getVersion() } self.logger.warning(message) dialog = gtk.MessageDialog(flags = gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, buttons = gtk.BUTTONS_CLOSE, message_format = message) dialog.run() @@ -764,92 +764,18 @@ _ver = self.currentSnp.getVersion() self._make_topwin_busy(False) if _ver == Infos.SNPCURVERSION: - self.widgets["upgradeBox"].hide() -# if self.currentSnp.isfull(): -# self.widgets["RebaseBox"].hide() -# else: -# self.widgets["RebaseBox"].show() self.widgets["txt_current_base"].set_text(str(self.currentSnp.getBase())) self.widgets["deleteBox"].show() - elif _ver < Infos.SNPCURVERSION : - self.widgets["upgradeBox"].show() -# self.widgets["RebaseBox"].hide() - self.widgets["deleteBox"].hide() else : - self.widgets["upgradeBox"].hide() -# self.widgets["RebaseBox"].hide() self.widgets["deleteBox"].hide() - message = _("The version of the snapshot is greater than the supported one!") + message = _("Snapshot version is not supported (Only %(supportedversion)s is supported). Version '%(currentversion)s' found.") % {'supportedversion': Infos.SNPCURVERSION, 'currentversion':self.currentSnp.getVersion() } + self.logger.warning(message) dialog = gtk.MessageDialog(flags = gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, buttons = gtk.BUTTONS_CLOSE, message_format = message) dialog.run() dialog.destroy() else: - self.widgets["upgradeBox"].hide() -# self.widgets["RebaseBox"].hide() self.widgets["deleteBox"].hide() - def on_upgradeButton_clicked(self, *args): #IGNORE:W0613 - message = _("Upgrading the selected snapshot `%s` might corrupt your backup for this particular point in time. You cannot undo this operation. It is recommended to create a copy of the snapshot directory before upgrading it. The upgrade process takes a while - be patient.\n\nAre you sure that you want to upgrade the snapshot now?")\ - % self.currentSnp - dialog = misc.msgdialog(message_str = message, msgtype = gtk.MESSAGE_QUESTION, - parent = self.top_window, buttons = gtk.BUTTONS_YES_NO, - headline_str = _("Do you really want to upgrade snapshot?")) - response = dialog.run() - dialog.destroy() - if response == gtk.RESPONSE_YES: - self._make_topwin_busy(True, _("Upgrade snapshot '%s'") % self.currentSnp.getName()) - gobject.idle_add(self._upgrade) - - def _upgrade(self): - um = UpgradeManager() - try: - self.logger.debug("Upgrade snapshot '%s'" % self.currentSnp.getName()) - um.upgradeSnapshot(self.currentSnp) - gobject.idle_add(self._show_infomessage, - _("Snapshot was sucessfully upgraded."), - _("Simple Backup upgrade"), - _("Upgrade finished")) - except Exception, error: - self.logger.exception("Error while upgrade snapshot: %s" % error) - _message_str = _("While attempting to upgrade snapshot the following error occurred:\n%s")\ - % error - gobject.idle_add(self._show_errmessage, - _message_str, _("Simple Backup error"), _("Unable to upgrade snapshot")) - finally: - self._make_topwin_busy(False) - - self.load_snapshotslist(self.widgets['calendar'].get_date()) - self.widgets['snpmanExpander'].set_expanded(False) - self.on_snpmanExpander_activate() - self.widgets['snpmanExpander'].set_expanded(True) - - def on_rebaseButton_toggled(self, *args): - if self.widgets['rebaseButton'].get_active(): - self.widgets['snphistoryFrame'].show() - histlist = self.snpman.getSnpHistory(self.currentSnp) - for snapshot in histlist: - self.historylisttreestore.append(None, [snapshot.getName()]) - else : - # get the selected base and rebase on it. - tstore, iter = self.widgets['historytv'].get_selection().get_selected() - if iter : - snp = self.snpman.get_snapshot_allformats(str(tstore.get_value(iter, 0))) - try: - message = _("Do you really want to rebase '%(current)s' on '%(base)s' ?") % {"current" : self.currentSnp, "base" : snp} - dialog = gtk.MessageDialog(parent = None, flags = 0, type = gtk.MESSAGE_QUESTION, buttons = gtk.BUTTONS_YES_NO, message_format = message) - response = dialog.run() - dialog.destroy() - if response == gtk.RESPONSE_YES: - self.snpman.rebaseSnapshot(self.currentSnp, snp) - except Exception, e: - self.logger.error(str(e)) - self.logger.error(traceback.format_exc()) - dialog = gtk.MessageDialog(flags = gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, buttons = gtk.BUTTONS_CLOSE, message_format = str(e)) - dialog.run() - dialog.destroy() - self.widgets['snphistoryFrame'].hide() - self.historylisttreestore.clear() - def on_deleteButton_clicked(self, *args): if self.currentSnp is not None: if self.snpman.is_standalone_snapshot(self.currentSnp): diff -Nru sbackup-0.11.4/src/sbackup/util/dbus_support.py sbackup-0.11.6/src/sbackup/util/dbus_support.py --- sbackup-0.11.4/src/sbackup/util/dbus_support.py 2011-02-13 18:22:20.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/util/dbus_support.py 2013-09-17 20:50:00.000000000 +0200 @@ -1,6 +1,6 @@ # Simple Backup - support of DBus functionality # -# Copyright (c)2008-2010: Jean-Peer Lorenz +# Copyright (c)2008-2010,2013: Jean-Peer Lorenz # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -609,8 +609,7 @@ 'finish', 'prepare', 'commit', - 'backup-canceled', - 'needupgrade'): + 'backup-canceled'): ret_val = self.__dbus.emit_event_signal(state, urgency) elif state == 'error': diff -Nru sbackup-0.11.4/src/sbackup/util/exceptions.py sbackup-0.11.6/src/sbackup/util/exceptions.py --- sbackup-0.11.4/src/sbackup/util/exceptions.py 2011-02-13 18:22:20.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/util/exceptions.py 2013-09-17 20:50:00.000000000 +0200 @@ -1,6 +1,6 @@ # Simple Backup - definition of custom exceptions # -# Copyright (c)2008-2010: Jean-Peer Lorenz +# Copyright (c)2008-2010,2013: Jean-Peer Lorenz # Copyright (c)2007-2008: Ouattara Oumar Aziz # # This program is free software; you can redistribute it and/or modify @@ -73,6 +73,11 @@ """This Exception is thrown if the backup process is canceled from the indicator gui. """ + +class HookedScriptError(SBException) : + """This Exception is thrown if a script run pre/post backup returns + exitcodes != 0. + """ class NotValidSnapshotException(SBException) : """ @@ -104,16 +109,6 @@ """Thrown when an IO operation times out. """ -class RebaseSnpException(SBException): - """Thrown for rebase exception - - """ - -class RebaseFullSnpForbidden(RebaseSnpException): - """Thrown when trying to rebase a full snapshot - - """ - class RemoveSnapshotHasChildsError(SBackupError): """Is raised if snapshot removal fails. """ @@ -163,3 +158,8 @@ """This Exception is thrown when remote path is not mountable. """ + +class FileAlreadyClosedError(SBException) : + """This Exception is thrown when a file or stream cannot be closed because it is already closed. + + """ diff -Nru sbackup-0.11.4/src/sbackup/util/filecollect.py sbackup-0.11.6/src/sbackup/util/filecollect.py --- sbackup-0.11.4/src/sbackup/util/filecollect.py 2011-02-13 18:22:20.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/util/filecollect.py 2013-09-17 20:50:00.000000000 +0200 @@ -248,7 +248,6 @@ self.__configuration = None # stats of last processed file - self.__exists_func = None self.__stat_func = None self.__fstats = None self.__fislink = None @@ -302,10 +301,8 @@ retrieval of file stats selected here. """ if self.__snapshot.isFollowLinks(): - self.__exists_func = os.path.exists self.__stat_func = os.stat else: - self.__exists_func = os.path.lexists self.__stat_func = os.lstat self.__collect_stats.clear() @@ -329,21 +326,11 @@ def __is_not_accessable(self, path): """Tests whether the given `path` can be accessed (i.e. exists and is readable). """ - # return true if the file doesn't exist - try: - if not self.__exists_func(path): - self.__logger.warning(_("File '%(file)s' does not exist.") % {'file' : path}) - return True - except OSError: - return True - # get the stats, If not possible, the file has to be exclude, return True try: self.__fstats = self.__stat_func(path) self.__fisdir = local_file_utils.is_dir(path) self.__fislink = local_file_utils.is_link(path) -# self.__fisdir = self.__local_fop.is_dir(path) -# self.__fislink = self.__local_fop.is_link(path) except Exception, _exc: #IGNORE:W0703 self.__logger.warning(_("File '%(file)s' is not accessable with error '%(error)s'.")\ % {'file' : path, 'error' : str(_exc)}) @@ -377,15 +364,6 @@ # pass return _res - def __is_excluded_by_default(self, path): - """Tests whether the given `path` is excluded by default. Currently the - path is excluded by default in the case it is the target directory. - """ - if path == self.__configuration.get_target_dir(): - self.__logger.info(_("File '%(file)s' is backup's target directory.") % {'file' : path}) - return True - return False - def __is_circular_symlink(self, path): if self.__fislink: if self.__snapshot.isFollowLinks(): @@ -397,14 +375,41 @@ #test passed return False - def _is_excluded_by_config(self, path): + def _is_excluded_by_name(self, path): + """Decides whether or not a path has to be excluded by + its name using the lists of defined + * snapshot destination + * regular expressions + * blacklisted names. + + @return: True if the file has to be excluded, false if not + """ + if path == self.__configuration.get_target_dir(): + self.__logger.info(_("File '%(file)s' is backup's target directory.") % {'file' : path}) + return True + + # if the file is in exclude list, return true + if self.__snapshot.is_path_in_excl_filelist(path): + self.__logger.info(_("Path '%(file)s' defined in excludes list.") % {'file' : path}) + return True + + # if the file matches an exclude regexp, return true +# TODO: Regex are applied to the full path. Add a choice to apply Regex only to files, directories etc. + for _regex in self.__excl_regex: + _regex_res = _regex.search(path) + if _regex_res is not None: + self.__logger.info(_("File '%(file)s' matches regular expression '%(regex)s'.")\ + % {'file' : path, 'regex' : str(_regex.pattern)}) + return True + #all tests passed + return False + + def _is_excluded_by_size(self, path): """Decides whether or not a file is to be excluded by the configuration. It is not decided for the incremental exclusion. Currently, following configuration options are tested: * file size - * regular expressions - * list of explicitely defined exclusions. @return: True if the file has to be excluded, false if not """ @@ -415,20 +420,6 @@ % {'file' : path, 'filesize' : str(self.__fstats.st_size), 'maxsize' : str(self.__configuration.get_maxsize_limit())}) return True - - # if the file matches an exclude regexp, return true -# TODO: Regex are applied to the full path. Add a choice to apply Regex only to files, directories etc. - for _regex in self.__excl_regex: - _regex_res = _regex.search(path) - if _regex_res is not None: - self.__logger.info(_("File '%(file)s' matches regular expression '%(regex)s'.")\ - % {'file' : path, 'regex' : str(_regex.pattern)}) - return True - - # if the file is in exclude list, return true - if self.__snapshot.is_path_in_excl_filelist(path): - self.__logger.info(_("Path '%(file)s' defined in excludes list.") % {'file' : path}) - return True #all tests passed return False @@ -439,14 +430,11 @@ @return: True if the file has to be excluded, false if not """ - _res = False - if self.__is_excluded_by_default(path) is True: - _res = True - elif self.__is_not_accessable(path) is True: - _res = True + if self.__is_not_accessable(path) is True: + return True elif self.__is_circular_symlink(path) is True: - _res = True - return _res + return True + return False def _check_for_excludes(self, path): #, force_exclusion=False): """Checks given `path` for exclusion and adds it to the `ExcludeFlist` if @@ -462,13 +450,21 @@ _excluded = False _stop_checking = False - if self._is_excluded_by_force(path): + if self._is_excluded_by_name(path): + if not self.__snapshot.is_subpath_in_incl_filelist(path): + # add to exclude list, if not explicitly included; since paths can be nested, + # it is checked for sub-paths instead of full paths + self.__snapshot.addToExcludeFlist(path) + self.__collect_stats.count_excl_config() + _excluded = True + + elif self._is_excluded_by_force(path): # force exclusion e.g. path is defined in includes list but does not exist/is not accessable self.__snapshot.addToExcludeFlist(path) self.__collect_stats.count_excl_forced() _excluded = True - elif self._is_excluded_by_config(path): + elif self._is_excluded_by_size(path): if not self.__snapshot.is_subpath_in_incl_filelist(path): # add to exclude list, if not explicitly included; since paths can be nested, # it is checked for sub-paths instead of full paths @@ -540,7 +536,7 @@ else: self.__collect_stats.count_skip_file() - def __prepare_excl_regex(self): + def __compile_excl_regex(self): """Prepares (i.e. compiles) Regular Expressions used for excluding files from flist. """ self.__logger.debug("Prepare Regular Expressions used for file exclusion.") @@ -608,7 +604,7 @@ the backup. """ self.__prepare_collecting() - self.__prepare_excl_regex() + self.__compile_excl_regex() self.__prepare_explicit_flists() util.enable_timeout_alarm() diff -Nru sbackup-0.11.4/src/sbackup/util/interfaces.py sbackup-0.11.6/src/sbackup/util/interfaces.py --- sbackup-0.11.4/src/sbackup/util/interfaces.py 2011-02-13 18:22:20.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/util/interfaces.py 2013-09-17 20:50:00.000000000 +0200 @@ -181,3 +181,7 @@ @classmethod def is_dir(cls, path): raise NotImplementedError(_get_notimplemented_msg("IOperations", "is_dir")) + + @classmethod + def close_stream(cls, file_desc): + raise NotImplementedError(_get_notimplemented_msg("IOperations", "close_stream")) diff -Nru sbackup-0.11.4/src/sbackup/util/local_file_utils.py sbackup-0.11.6/src/sbackup/util/local_file_utils.py --- sbackup-0.11.4/src/sbackup/util/local_file_utils.py 2011-02-13 18:22:20.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/util/local_file_utils.py 2013-09-17 20:50:00.000000000 +0200 @@ -1,6 +1,6 @@ # Simple Backup - unified file handling using (Python's) native functions # -# Copyright (c)2009-2010: Jean-Peer Lorenz +# Copyright (c)2009-2010,2013: Jean-Peer Lorenz # Copyright (c)2007-2009: Ouattara Oumar Aziz # # This program is free software; you can redistribute it and/or modify @@ -208,6 +208,15 @@ _add_write_permission(path, recursive = True) delete(path) +def destinsrc(src, dst): + src = os.path.abspath(src) + dst = os.path.abspath(dst) + if not src.endswith(os.path.sep): + src += os.path.sep + if not dst.endswith(os.path.sep): + dst += os.path.sep + return dst.startswith(src) + def force_move(src, dst): """Modified version of `shutil.move` that uses `nssb_copytree` and even removes read-only files/directories. @@ -218,7 +227,7 @@ os.rename(src, dst) except OSError: if os.path.isdir(src): - if shutil.destinsrc(src, dst): + if destinsrc(src, dst): raise shutil.Error("Cannot move a directory '%s' into itself "\ "'%s'." % (src, dst)) # _copytree(src, dst, symlinks = True) @@ -355,6 +364,21 @@ else: _add_write_permission(_entrypath, recursive = False) +def chmod_no_rwx_grp_oth(path): + """Sets write permissions for user only for + given directory or file (*not* recursive). + """ + try: + fstats = os.stat(path) + fmode = fstats.st_mode + fmode = fmode & system.UNIX_PERM_GRPOTH_NORWX + os.chmod(path, fmode) + except Exception, error: + _msg = "Unable to set permissions: %s" % str(error) + _logger = log.LogFactory.getLogger() + _logger.warning(_msg) + return + def rename(src, dst): # avoids (misused) move operations using `rename` _dstf = joinpath(get_dirname(src), get_basename(dst)) diff -Nru sbackup-0.11.4/src/sbackup/util/pathparse.py sbackup-0.11.6/src/sbackup/util/pathparse.py --- sbackup-0.11.4/src/sbackup/util/pathparse.py 2011-02-13 18:22:21.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/util/pathparse.py 2013-09-17 20:50:00.000000000 +0200 @@ -171,9 +171,9 @@ # contains password in plain text # _logger.debug("set and parse uri: %s" % uri) self.__clear() - splituri = urlparse.urlsplit(uri) + splituri = urlparse.urlsplit(uri, scheme = "", allow_fragments = False) self.__uri = splituri.geturl() # gets normalized URI - splituri = urlparse.urlsplit(self.__uri) + splituri = urlparse.urlsplit(self.__uri, scheme = "", allow_fragments = False) # print "\nSplit uri:\n" # print "url: %s" % splituri.geturl() @@ -191,9 +191,13 @@ assert splituri.fragment == "" #IGNORE:E1103 assert splituri.query == "" #IGNORE:E1103 - if splituri.port is not None: - self.__port = splituri.port - + #LP #670646 ignore errors parsing port + try: + if splituri.port is not None: + self.__port = splituri.port + except ValueError: + pass + if splituri.username is not None: self.__username = urllib.unquote(splituri.username) @@ -205,7 +209,7 @@ else: self.__hostname = splituri.hostname - self.__path = splituri.path #IGNORE:E1103 + self.__path = urllib.quote(splituri.path) #IGNORE:E1103 # self.__uri_scheme = splituri.scheme #IGNORE:E1103 if splituri.scheme == "" and self.__uri.startswith("/"): #IGNORE:E1103 self.__uri_scheme = "file" @@ -216,8 +220,9 @@ _logger.debug("UriParser:\n%s" % self) def __construct_display_name(self): + _path = urllib.unquote(self.__path) if self.is_local(): - _res = self.__path + _res = _path else: _user = "" _host = "" @@ -225,7 +230,7 @@ _user = "%s@" % self.__username if self.__hostname is not None: _host = "%s" % self.__hostname - _res = "%s://%s%s%s" % (self.__uri_scheme, _user, _host, self.__path) + _res = "%s://%s%s%s" % (self.__uri_scheme, _user, _host, _path) return _res def query_mount_uri(self): diff -Nru sbackup-0.11.4/src/sbackup/util/system.py sbackup-0.11.6/src/sbackup/util/system.py --- sbackup-0.11.4/src/sbackup/util/system.py 2011-02-13 18:22:20.000000000 +0100 +++ sbackup-0.11.6/src/sbackup/util/system.py 2013-09-17 20:50:00.000000000 +0200 @@ -1,6 +1,6 @@ # Simple Backup - Operation System related utilities # -# Copyright (c)2010: Jean-Peer Lorenz +# Copyright (c)2010,2013: Jean-Peer Lorenz # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -33,6 +33,7 @@ PATHSEP = os.sep UNIX_PERM_ALL_WRITE = stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH +UNIX_PERM_GRPOTH_NORWX = ~(stat.S_IRWXG | stat.S_IRWXO) COMMAND_GREP = "grep" @@ -356,16 +357,17 @@ #TODO: implement Singleton class for access to environment def get_session_environment(): + #FIXME: support Unity, Mate, Cinnamon + _sessionnames = ("x-session-manager", "gnome-session", "gnome-shell", + "ksmserver", "xfce4-session") mod_env = None - if grep_pid("x-session-manager") is not None: - mod_env = _get_session_env(session = "x-session-manager") - elif grep_pid("gnome-session") is not None: - mod_env = _get_session_env(session = "gnome-session") - elif grep_pid("ksmserver") is not None: - mod_env = _get_session_env(session = "ksmserver") - else: - mod_env = None - print "No desktop session found" + for _name in _sessionnames: + if grep_pid(_name) is not None: + mod_env = _get_session_env(session = _name) + print "Desktop session %s found" % _name + break + if mod_env is None: + print "No Desktop session found" return mod_env @@ -422,8 +424,19 @@ def grep_pid(processname): + """ + note for using pgrep: The process name used for matching is limited to + the 15 characters present in the output of /proc/pid/stat. Use + the -f option to match against the complete command line /proc/pid/cmdline. + + therefore here a full RegEx is applied to complete command lines: + pgreg -f "^(/(.+/)*)?processname($|\s+.+) + + """ _pid = None - output = exec_command_stdout(args = ["pgrep", processname]) + output = exec_command_stdout(args = ["pgrep", "-f", + "^(/(.+/)*)?%s($|\s+.+)" % processname]) + print "DEBUG: pgrep %s = %s" % (processname, output) try: _pid = int(output) except ValueError: