Merge lp:~ciaran-mooney/nssbackup/mybranch into lp:nssbackup

[Ciarán Mooney]

[Ciarán Mooney (ciaran-mooney)]

Should fix a few of the en_GB.po stings. Fixes bugs #330387 and #328902

[Oumar Aziz OUATTARA (wattazoum)]

Hi,

I have reviewed you changes. First, thank you for taking time to fix all these.
The problem is that, fixing in the fixes in the po file will be lost once we regenerate them. Those files are generated automatically and come from the sources files.
Basically, when you see something like :

 #: src/nssbackup/managers/ConfigManager.py:541
 #, python-format
-msgid "The config file '%s' couldn't be read !"
+msgid "The config file '%s' couldn't be read!"
 msgstr ""

it means that the change would have to be made in ConfigManager.py.

review: Needs Fixing

[Jean-Peer Lorenz (peer.loz)]

Thank you for your help again. I've incorporated your suggestions manually into the series 0.2 branch. If you would like to help more (e.g. writing documentation etc.) feel free to contact us via nssbackup's mailing list: <email address hidden>

Best regards.
Jean-Peer (maintainer/developer)

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2009-03-12 21:17:46 +0000
+++ po/en_GB.po	2009-12-26 17:20:24 +0000
@@ -97,7 +97,7 @@
 msgstr ""
 
 #: src/nssbackup/managers/BackupManager.py:362
-msgid "File list ready , Committing to disk"
+msgid "File list ready , committing to disk"
 msgstr ""
 
 #: src/nssbackup/managers/BackupManager.py:399
@@ -153,7 +153,7 @@
 #: src/nssbackup/managers/BackupManager.py:536
 #, python-format
 msgid ""
-"Not enough free space on the target directory for the planned backup (%"
+"Not enough free space in the target directory for the planned backup (%"
 "(freespace)d <= %(neededspace)s)"
 msgstr ""
 
@@ -172,7 +172,7 @@
 msgstr ""
 
 #: src/nssbackup/managers/BackupManager.py:581
-msgid "Unable to find logfile to copy into snapshot"
+msgid "Unable to find logfile to copy into snapshot."
 msgstr ""
 
 #: src/nssbackup/managers/BackupManager.py:583
@@ -181,7 +181,7 @@
 
 #: src/nssbackup/managers/BackupManager.py:597
 #: src/nssbackup/managers/FuseFAM.py:244
-msgid "Terminating FUSE FILE ACCESS MANAGER !"
+msgid "Terminating FUSE FILE ACCESS MANAGER!"
 msgstr ""
 
 #: src/nssbackup/managers/BackupManager.py:600
@@ -198,7 +198,7 @@
 msgstr ""
 
 #: src/nssbackup/managers/BackupManager.py:621
-msgid "Target not writable : "
+msgid "Target not writeable : "
 msgstr ""
 
 #: src/nssbackup/managers/ConfigManager.py:406
@@ -210,17 +210,17 @@
 msgstr ""
 
 #: src/nssbackup/managers/ConfigManager.py:452
-msgid "You must provide a dictionary"
+msgid "You must provide a dictionary."
 msgstr ""
 
 #: src/nssbackup/managers/ConfigManager.py:541
 #, python-format
-msgid "The config file '%s' couldn't be read !"
+msgid "The config file '%s' couldn't be read!"
 msgstr ""
 
 #: src/nssbackup/managers/ConfigManager.py:565
 #, python-format
-msgid "section [%(section)s] in '%(configfile)s' should not exist, aborting"
+msgid "section [%(section)s] in '%(configfile)s' should not exist, aborting."
 msgstr ""
 
 #: src/nssbackup/managers/ConfigManager.py:664
@@ -228,7 +228,7 @@
 msgstr ""
 
 #: src/nssbackup/managers/ConfigManager.py:845
-msgid "Set the reciever of this mail"
+msgid "Set the receiver of this mail"
 msgstr ""
 
 #: src/nssbackup/managers/ConfigManager.py:847
@@ -238,17 +238,17 @@
 #: src/nssbackup/managers/ConfigManager.py:850
 msgid ""
 "When setting a username (resp password), password (resp username) is "
-"mandatory"
+"mandatory."
 msgstr ""
 
 #: src/nssbackup/managers/ConfigManager.py:852
-msgid "Choose the SSL option (smtptls=1) to be able to use Cert and Key"
+msgid "Choose the SSL option (smtptls=1) to be able to use Cert and Key."
 msgstr ""
 
 #: src/nssbackup/managers/ConfigManager.py:855
 msgid ""
 "When setting a ssl certificate (resp key), key (resp certificate) is "
-"mandatory"
+"mandatory."
 msgstr ""
 
 #: src/nssbackup/managers/ConfigManager.py:945
@@ -276,7 +276,7 @@
 #, python-format
 msgid ""
 "File '%(filename)s' not found in the backup snapshot [%(snapshotname)s] "
-"files list, We'll not fail though !"
+"files list, We'll not fail though!"
 msgstr ""
 
 #: src/nssbackup/managers/SnapshotManager.py:90
@@ -285,7 +285,7 @@
 
 #: src/nssbackup/managers/SnapshotManager.py:113
 #, python-format
-msgid "Snapshot '%s' not found "
+msgid "Snapshot '%s' not found."
 msgstr ""
 
 #: src/nssbackup/managers/SnapshotManager.py:174
@@ -324,22 +324,22 @@
 
 #: src/nssbackup/managers/SnapshotManager.py:465
 #, python-format
-msgid "Got an exception when Pulling '%s' : "
+msgid "Got an exception when pulling '%s' : "
 msgstr ""
 
 #: src/nssbackup/managers/SnapshotManager.py:497 src/nssbackup/util/tar.py:686
 #: src/nssbackup/util/tar.py:722
-msgid "The snarfile header is incomplete !"
+msgid "The snarfile header is incomplete!"
 msgstr ""
 
 #: src/nssbackup/managers/SnapshotManager.py:629
 #, python-format
-msgid "Snapshot '%s' is a full . Can't rebase on older snapshot"
+msgid "Snapshot '%s' is a full. Can't rebase on older snapshot."
 msgstr ""
 
 #: src/nssbackup/managers/SnapshotManager.py:662
 #, python-format
-msgid "Snapshot '%s' is already Full, nothing to do (not changing it to full"
+msgid "Snapshot '%s' is already full, nothing to do (not changing it to full)"
 msgstr ""
 
 #: src/nssbackup/managers/SnapshotManager.py:696
@@ -349,7 +349,7 @@
 
 #: src/nssbackup/managers/SnapshotManager.py:732
 #, python-format
-msgid "Deleting '%(snp)s' for purge !"
+msgid "Deleting '%(snp)s' for purge!"
 msgstr ""
 
 #: src/nssbackup/managers/UpgradeManager.py:167
@@ -374,7 +374,7 @@
 
 #: src/nssbackup/managers/UpgradeManager.py:278
 #, python-format
-msgid "The SNAR file alredy exist for snapshot '%s', I'll not overide it"
+msgid "The SNAR file already exist for snapshot '%s', I'll not override it"
 msgstr ""
 
 #: src/nssbackup/managers/UpgradeManager.py:382
@@ -400,7 +400,7 @@
 msgstr ""
 
 #: src/nssbackup/plugins/ftpFuseFAM.py:119
-msgid "FTP schema is like : ftp://user:pass@server/anything"
+msgid "FTP schema is : ftp://user:pass@server/anything"
 msgstr ""
 
 #: src/nssbackup/plugins/ftpFuseFAM.py:171
@@ -571,10 +571,10 @@
 
 #: src/nssbackup/ui/SBConfigGTK.py:813
 msgid ""
-"It seems the path you entered does not exists. Do you want to add this wrong "
+"It seems the path you entered does not exist. Do you want to add this incorrect "
 "path?"
 msgstr ""
-"It seems the path you entered does not exists. Do you want to add this wrong "
+"It seems the path you entered does not exist. Do you want to add this incorrect "
 "path?"
 
 #: src/nssbackup/ui/SBConfigGTK.py:841
@@ -647,7 +647,7 @@
 "You are trying to remove a profile. You will not be able to restore it .\n"
 " If you are not sure of what you are doing, please use the 'enable|disable' "
 "functionality.\n"
-" <b>Are you sure to want to delete the '%(name)s' profile ?</b> "
+" <b>Are you sure to want to delete the '%(name)s' profile?</b> "
 msgstr ""
 
 #: src/nssbackup/ui/SBRestoreGTK.py:70
@@ -680,7 +680,7 @@
 msgstr ""
 
 #: src/nssbackup/ui/SBRestoreGTK.py:109
-msgid "An error occured during initialization:"
+msgid "An error occurred during initialization:"
 msgstr ""
 
 #: src/nssbackup/ui/SBRestoreGTK.py:122 src/nssbackup/ui/SBRestoreGTK.py:142
@@ -716,7 +716,7 @@
 msgstr ""
 
 #: src/nssbackup/ui/SBRestoreGTK.py:490
-msgid "An error occured while reading snapshot:"
+msgid "An error occurred while reading snapshot:"
 msgstr ""
 
 #: src/nssbackup/ui/SBRestoreGTK.py:496
@@ -728,7 +728,7 @@
 msgstr ""
 
 #: src/nssbackup/ui/SBRestoreGTK.py:536
-msgid "No backups found for this day !"
+msgid "No backups found for this day!"
 msgstr ""
 
 #: src/nssbackup/ui/SBRestoreGTK.py:549
@@ -794,15 +794,15 @@
 
 #: src/nssbackup/ui/SBRestoreGTK.py:798
 #, python-format
-msgid "Restoring of <tt>'%s'</tt> was sucessful."
+msgid "Restoring of <tt>'%s'</tt> was successful."
 msgstr ""
 
 #: src/nssbackup/ui/SBRestoreGTK.py:799
 #, python-format
 msgid ""
-"Restoring of <tt>'%s'</tt> was not sucessful.\n"
+"Restoring of <tt>'%s'</tt> was not successful.\n"
 "\n"
-"The following error occured:\n"
+"The following error occurred:\n"
 msgstr ""
 
 #: src/nssbackup/ui/SBRestoreGTK.py:803
@@ -825,7 +825,7 @@
 "Restoring of <tt>'%(source)s'</tt>\n"
 "to <tt>'%(dirname)s'</tt> was not sucessful.\n"
 "\n"
-"The following error occured:\n"
+"The following error occurred:\n"
 msgstr ""
 
 #: src/nssbackup/ui/SBRestoreGTK.py:808 src/nssbackup/ui/SBRestoreGTK.py:814
@@ -847,7 +847,7 @@
 msgid ""
 "Reverting of <tt>'%s'</tt> was not sucessful.\n"
 "\n"
-"The following error occured:\n"
+"The following error occurred:\n"
 msgstr ""
 
 #: src/nssbackup/ui/SBRestoreGTK.py:815
@@ -870,11 +870,11 @@
 "Reverting of <tt>'%(source)s'</tt>\n"
 "to <tt>'%(dirname)s'</tt> was not sucessful.\n"
 "\n"
-"The following error occured:\n"
+"The following error occurred:\n"
 msgstr ""
 
 #: src/nssbackup/util/Snapshot.py:112
-msgid "Snapshot is inconsistant : __name is not set "
+msgid "Snapshot is inconsistent : __name is not set "
 msgstr ""
 
 #: src/nssbackup/util/Snapshot.py:123
@@ -883,20 +883,20 @@
 msgstr ""
 
 #: src/nssbackup/util/Snapshot.py:171
-msgid "Snapshot is inconsistant : __snapshotpath is not set "
+msgid "Snapshot is inconsistent : __snapshotpath is not set "
 msgstr ""
 
 #: src/nssbackup/util/Snapshot.py:245
 #, python-format
 msgid ""
 "The snapshot compression format is supposed to be '%s' but the corresponding "
-"well named file wasn't found"
+"well named file wasn't found."
 msgstr ""
 
 #: src/nssbackup/util/Snapshot.py:269
 #, python-format
 msgid ""
-"%(file)s doesn't contain valid value ! Ignoring incomplete or non-backup "
+"%(file)s doesn't contain valid value! Ignoring incomplete or non-backup "
 "directory. "
 msgstr ""
 
@@ -912,33 +912,33 @@
 
 #: src/nssbackup/util/Snapshot.py:448
 #, python-format
-msgid "The mandatory 'ver' file doesn't exist in [%s]"
+msgid "The mandatory 'ver' file doesn't exist in [%s]."
 msgstr ""
 
 #: src/nssbackup/util/Snapshot.py:487
-msgid "Base name must be set for inc backup !"
+msgid "Base name must be set for incremental backup!"
 msgstr ""
 
 #: src/nssbackup/util/tar.py:87 src/nssbackup/util/tar.py:134
 #: src/nssbackup/util/tar.py:174 src/nssbackup/util/tar.py:208
-msgid "Invalid Archive type"
+msgid "Invalid Archive type."
 msgstr ""
 
 #: src/nssbackup/util/tar.py:277
 msgid ""
-"For the moment split functionality is not compatible with compress option ! "
+"For the moment split functionality is not compatible with compress option! "
 msgstr ""
 
 #: src/nssbackup/util/tar.py:287
-msgid "Launching TAR to make Inc backup "
+msgid "Launching TAR to make Incremental backup. "
 msgstr ""
 
 #: src/nssbackup/util/tar.py:306
-msgid "Unable to find the SNAR file to make an Incremental backup"
+msgid "Unable to find the SNAR file to make an Incremental backup."
 msgstr ""
 
 #: src/nssbackup/util/tar.py:307
-msgid "Falling back to full backup"
+msgid "Falling back to full backup."
 msgstr ""
 
 #: src/nssbackup/util/tar.py:328 src/nssbackup/util/tar.py:374
@@ -972,20 +972,20 @@
 msgstr ""
 
 #: src/nssbackup/util/tar.py:484
-msgid "Dumpdir inconsistancy : 'filename' is empty"
+msgid "Dumpdir inconsistency : 'filename' is empty."
 msgstr ""
 
 #: src/nssbackup/util/tar.py:497
-msgid "Dumpdir inconsistancy : 'control' is empty"
+msgid "Dumpdir inconsistency : 'control' is empty."
 msgstr ""
 
 #: src/nssbackup/util/tar.py:569
 #, python-format
-msgid "'%s' doesn't exist "
+msgid "'%s' doesn't exist."
 msgstr ""
 
 #: src/nssbackup/util/tar.py:885
-msgid "A SnapshotFile is required"
+msgid "A SnapshotFile is required."
 msgstr ""
 
 #: src/nssbackup/util/tar.py:974
@@ -1022,11 +1022,11 @@
 "Files and directories matching this expression will be excluded from backup."
 
 #: datas/nssbackup-config.glade:242
-msgid "Enter the remote target to include"
+msgid "Enter the remote target to include."
 msgstr ""
 
 #: datas/nssbackup-config.glade:260
-msgid "Choose a plugin to get the format"
+msgid "Choose a plugin to get the format."
 msgstr ""
 
 #: datas/nssbackup-config.glade:274
@@ -1045,7 +1045,7 @@
 msgid ""
 "The configuration has changed.\n"
 "If you want to use the new configuration, you should save it. \n"
-"Do you want to save ?"
+"Do you want to save?"
 msgstr ""
 
 #: datas/nssbackup-config.glade:439
@@ -1064,8 +1064,8 @@
 msgid ""
 "<b>Configuration Profile Manager</b>\n"
 "\n"
-"This dialog will help you manage your configuration profiles.\n"
-"You can set up a number of configuration profile that will be run by "
+"This dialogue will help you manage your configuration profiles.\n"
+"You can set up a number of configuration profiles that will be run by "
 "NSsbackup when it starts the backup.\n"
 "Thanks to this you can configure backup of different kinds to different "
 "places.\n"
@@ -1134,13 +1134,13 @@
 "<small>Do standard backups.\n"
 "Defaults: daily incremental and weekly full backup to /var/backup of all "
 "user files, /etc, /usr/local and /var. \n"
-"Multimedia files, temporary files and files larger than 100 Mb are excluded."
+"Multimedia files, temporary files and files larger than 100 MB are excluded."
 "</small>"
 msgstr ""
 "<small>Do standard backups.\n"
 "Defaults: daily incremental and weekly full backup to /var/backup of all "
 "user files, /etc, /usr/local and /var. \n"
-"Multimedia files, temporary files and files larger than 100 Mb are excluded."
+"Multimedia files, temporary files and files larger than 100 MB are excluded."
 "</small>"
 
 #: datas/nssbackup-config.glade:1089
@@ -1150,10 +1150,10 @@
 #: datas/nssbackup-config.glade:1124
 msgid ""
 "<small>Do backups according to the settings defined on the next pages of "
-"this dialog.</small>"
+"this dialogue.</small>"
 msgstr ""
 "<small>Do backups according to the settings defined on the next pages of "
-"this dialog.</small>"
+"this dialogue.</small>"
 
 #: datas/nssbackup-config.glade:1140
 msgid "Manual backups only"
@@ -1183,7 +1183,7 @@
 #: datas/nssbackup-config.glade:1235
 msgid ""
 "Split the backup archive into small pieces (value in MB)\n"
-"<small>You can split the snapshot to make backup on some filesystem that "
+"<small>You can split the snapshot to make backup on some file system that "
 "doesn't support large files.</small>\n"
 "<b>Note: This functionality is not compatible with compress !</b>"
 msgstr ""
@@ -1233,8 +1233,8 @@
 msgstr "Do not backup files bigger than "
 
 #: datas/nssbackup-config.glade:1992
-msgid "Mb"
-msgstr "Mb"
+msgid "MB"
+msgstr "MB"
 
 #: datas/nssbackup-config.glade:2009
 msgid "Follow symbolic links "
@@ -1270,10 +1270,10 @@
 
 #: datas/nssbackup-config.glade:2264
 msgid ""
-"<i>The selected destination is not writtable with current permissions.\n"
+"<i>The selected destination is not writeable with current permissions.\n"
 "The backups can not be written there.</i>"
 msgstr ""
-"<i>The selected destination is not writtable with current permissions.\n"
+"<i>The selected destination is not writeable with current permissions.\n"
 "The backups can not be written there.</i>"
 
 #: datas/nssbackup-config.glade:2294
@@ -1306,8 +1306,8 @@
 
 #: datas/nssbackup-config.glade:2345
 msgid ""
-"This option will make nssbackup make a backup not at a precise time but when "
-"the computer is up. "
+"This option will make nssbackup do a backup not at a precise time but when "
+"the computer is on. "
 msgstr ""
 
 #: datas/nssbackup-config.glade:2359
@@ -1367,8 +1367,8 @@
 msgstr "Enable purging of old and incomplete backups"
 
 #: datas/nssbackup-config.glade:2700
-msgid "Simple cutoff: Erase all backups older than "
-msgstr "Simple cutoff: Erase all backups older than "
+msgid "Simple cut-off: Erase all backups older than "
+msgstr "Simple cut-off: Erase all backups older than "
 
 #: datas/nssbackup-config.glade:2759
 msgid "Logarithmic"
@@ -1376,7 +1376,7 @@
 
 #: datas/nssbackup-config.glade:2779
 msgid ""
-"<small>Keep progressivelly less backups into the past:\n"
+"<small>Keep progressively less backups into the past:\n"
 "Keep all backups from yesterday.\n"
 "Keep one backup per day from last week.\n"
 "Keep one backup per week from last month.\n"
@@ -1384,7 +1384,7 @@
 "Keep one backup per year further into past.\n"
 "Erase all other backups.</small>\n"
 msgstr ""
-"<small>Keep progressivelly less backups into the past:\n"
+"<small>Keep progressively less backups into the past:\n"
 "Keep all backups from yesterday.\n"
 "Keep one backup per day from last week.\n"
 "Keep one backup per week from last month.\n"
@@ -1413,7 +1413,7 @@
 msgstr ""
 
 #: datas/nssbackup-config.glade:2900
-msgid "Debug is just for debbuging purpose.Info is the recommended setting"
+msgid "Debug is just for debugging purpose. Info is the recommended setting"
 msgstr ""
 
 #: datas/nssbackup-config.glade:2901
@@ -1422,7 +1422,7 @@
 
 #: datas/nssbackup-config.glade:2908
 msgid ""
-"Debug is just for debbuging purpose\n"
+"Debug is just for debugging purpose\n"
 "Info is the recommended setting"
 msgstr ""
 
@@ -1471,7 +1471,7 @@
 msgstr ""
 
 #: datas/nssbackup-config.glade:3265
-msgid "Use secured connexion"
+msgid "Use secured connection"
 msgstr ""
 
 #: datas/nssbackup-config.glade:3342
@@ -1492,7 +1492,7 @@
 
 #: datas/nssbackup-restore.glade:22
 msgid ""
-"<b>Using this windows you can manage your backups, restore them, revert an "
+"<b>Using this window you can manage your backups, restore them, revert an "
 "existing directory to a previous state ...</b>"
 msgstr ""
 
@@ -1517,7 +1517,7 @@
 
 #: datas/nssbackup-restore.glade:222
 msgid ""
-"The backups availibily dates have been marked <b>bold</b>. \n"
+"The backups availability dates have been marked <b>bold</b>. \n"
 "Select them to retrieve the backup list for that date."
 msgstr ""