mirror
/
vorta
mirror of https://github.com/borgbase/vorta
1
0
Fork 0
Code Issues Releases Wiki Activity

UI texts: improve wording, fix typos

This commit is contained in:
Thomas Waldmann 2018-11-21 12:22:47 +01:00
parent 8d01767b60
commit 8b4c23ecb2
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vorta/assets/UI/profileadd.ui
View File

@ -56,7 +56,7 @@
</font>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Repositories and SSH keys are shared between profiles. Source folders, active destination repo, allowed networks, pruning, validation and scheduling are per-profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Repositories and SSH keys are shared between profiles. Source folders, active destination repo, allowed networks, pruning, validation and scheduling are per-profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>

4
src/vorta/assets/UI/repotab.ui
View File

@ -32,7 +32,7 @@
</sizepolicy>
</property>
<property name="text">
<string>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.</string>
<string>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).</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@ -113,7 +113,7 @@
<string notr="true">margin-bottom: 10</string>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remote or local backup repository. For secure remote bakcups, try &lt;a href=&quot;https://www.borgbase.com/?utm_source=vorta&amp;utm_medium=app&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;BorgBase&lt;/span&gt;&lt;/a&gt;. 100GB free during Beta.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remote or local backup repository. For secure remote backups, try &lt;a href=&quot;https://www.borgbase.com/?utm_source=vorta&amp;utm_medium=app&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;BorgBase&lt;/span&gt;&lt;/a&gt;. 100GB free during Beta.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>

2
src/vorta/assets/UI/scheduletab.ui
View File

@ -71,7 +71,7 @@ font-weight: bold;
</sizepolicy>
</property>
<property name="text">
<string>Backup Manually.</string>
<string>Backup manually.</string>
</property>
</widget>
</item>

6
src/vorta/borg/borg_thread.py
View File

@ -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:

2
src/vorta/models.py
View File

@ -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
"""

4
src/vorta/views/repo_add.py
View File

@ -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')

2
src/vorta/views/source_tab.py
View File

@ -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)