From 8b4c23ecb299ad6569c3ad3c177bae915489f2ea Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 21 Nov 2018 12:22:47 +0100 Subject: [PATCH] UI texts: improve wording, fix typos --- src/vorta/assets/UI/profileadd.ui | 2 +- src/vorta/assets/UI/repotab.ui | 4 ++-- src/vorta/assets/UI/scheduletab.ui | 2 +- src/vorta/borg/borg_thread.py | 6 +++--- src/vorta/models.py | 2 +- src/vorta/views/repo_add.py | 4 ++-- src/vorta/views/source_tab.py | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/vorta/assets/UI/profileadd.ui b/src/vorta/assets/UI/profileadd.ui index a0738654..bbe47732 100644 --- a/src/vorta/assets/UI/profileadd.ui +++ b/src/vorta/assets/UI/profileadd.ui @@ -56,7 +56,7 @@ - <html><head/><body><p>Backup profiles allow for granular backups from different sources to different destinations. You could e.g. back up essential documents to a remote repository via Wifi, while havine a full backup to a thumb drive.</p><p>Repositories and SSH keys are shared between profiles. Source folders, active destination repo, allowed networks, pruning, validation and scheduling are per-profile.</p></body></html> + <html><head/><body><p>Backup profiles allow for granular backups from different sources to different destinations. You could e.g. back up essential documents to a remote repository via Wifi, while doing a full backup onto a thumb drive.</p><p>Repositories and SSH keys are shared between profiles. Source folders, active destination repo, allowed networks, pruning, validation and scheduling are per-profile.</p></body></html> true diff --git a/src/vorta/assets/UI/repotab.ui b/src/vorta/assets/UI/repotab.ui index 3b23022b..129089fa 100644 --- a/src/vorta/assets/UI/repotab.ui +++ b/src/vorta/assets/UI/repotab.ui @@ -32,7 +32,7 @@ - Configure your remote backup repository. First you will need a SSH key to login without a password. If you already have one, just keep it at the default. Next you can add a new or existing repository. + Configure your backup repository (you can add a new or existing repository). For remote repositories, you will need a SSH key to log in without a password (if you already have a key, just keep it at the default). true @@ -113,7 +113,7 @@ margin-bottom: 10 - <html><head/><body><p>Remote or local backup repository. For secure remote bakcups, try <a href="https://www.borgbase.com/?utm_source=vorta&utm_medium=app"><span style=" text-decoration: underline; color:#0000ff;">BorgBase</span></a>. 100GB free during Beta.</p></body></html> + <html><head/><body><p>Remote or local backup repository. For secure remote backups, try <a href="https://www.borgbase.com/?utm_source=vorta&utm_medium=app"><span style=" text-decoration: underline; color:#0000ff;">BorgBase</span></a>. 100GB free during Beta.</p></body></html> true diff --git a/src/vorta/assets/UI/scheduletab.ui b/src/vorta/assets/UI/scheduletab.ui index 7b026f9f..2eb1c905 100644 --- a/src/vorta/assets/UI/scheduletab.ui +++ b/src/vorta/assets/UI/scheduletab.ui @@ -71,7 +71,7 @@ font-weight: bold; - Backup Manually. + Backup manually. diff --git a/src/vorta/borg/borg_thread.py b/src/vorta/borg/borg_thread.py index 4261e230..b1e38e00 100644 --- a/src/vorta/borg/borg_thread.py +++ b/src/vorta/borg/borg_thread.py @@ -15,7 +15,7 @@ mutex = QtCore.QMutex() class BorgThread(QtCore.QThread, BackupProfileMixin): """ - Base class to run `borg` command line jobs. If a command needs more pre- or past-processing + Base class to run `borg` command line jobs. If a command needs more pre- or post-processing it should sublass `BorgThread`. """ @@ -86,7 +86,7 @@ class BorgThread(QtCore.QThread, BackupProfileMixin): return ret if profile.repo is None: - ret['message'] = 'Add a remote backup repository first.' + ret['message'] = 'Add a backup repository first.' return ret ret['ssh_key'] = profile.ssh_key @@ -183,7 +183,7 @@ class BorgThreadChain(BorgThread): def __init__(self, cmds, input_values, parent=None): """ - Takes a list of tuples with `BorgThread` subclass and optional input parameters. Then all actions are exectuted + Takes a list of tuples with `BorgThread` subclass and optional input parameters. Then all actions are executed and a merged result object is returned to the caller. If there is any error, then current result is returned. :param actions: diff --git a/src/vorta/models.py b/src/vorta/models.py index f91b98e6..458562ab 100644 --- a/src/vorta/models.py +++ b/src/vorta/models.py @@ -17,7 +17,7 @@ db = pw.Proxy() class JSONField(pw.TextField): """ - Class to "fake" a JSON field with a text field. Not efficient but works nicely + Class to "fake" a JSON field with a text field. Not efficient but works nicely. From: https://gist.github.com/rosscdh/f4f26758b0228f475b132c688f15af2b """ diff --git a/src/vorta/views/repo_add.py b/src/vorta/views/repo_add.py index cc927528..bfac36bf 100644 --- a/src/vorta/views/repo_add.py +++ b/src/vorta/views/repo_add.py @@ -75,9 +75,9 @@ class AddRepoWindow(AddRepoBase, AddRepoUI): self.accept() def init_encryption(self): - self.encryptionComboBox.addItem('Repokey-Blake2 (Recommended, key stored remotely)', 'repokey-blake2') + self.encryptionComboBox.addItem('Repokey-Blake2 (Recommended, key stored in repository)', 'repokey-blake2') self.encryptionComboBox.addItem('Repokey', 'repokey') - self.encryptionComboBox.addItem('Keyfile-Blake2 (Key stored locally)', 'keyfile-blake2') + self.encryptionComboBox.addItem('Keyfile-Blake2 (Key stored in home directory)', 'keyfile-blake2') self.encryptionComboBox.addItem('Keyfile', 'keyfile') self.encryptionComboBox.addItem('None (not recommended', 'none') diff --git a/src/vorta/views/source_tab.py b/src/vorta/views/source_tab.py index 3e0e1403..7224a38a 100644 --- a/src/vorta/views/source_tab.py +++ b/src/vorta/views/source_tab.py @@ -43,7 +43,7 @@ class SourceTab(SourceBase, SourceUI, BackupProfileMixin): self.sourceDirectoriesWidget.addItem(dir[0]) new_source.save() - dialog = choose_folder_dialog(self, "Choose Backup Directory") + dialog = choose_folder_dialog(self, "Choose Directory to back up") dialog.open(receive)