diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 63564d46..0ed61a26 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -54,75 +54,86 @@ To test for style errors:
$ flake8
```
-## Working with translations
+## Translations
-NOTE: we are currently still working on the original strings.
- DO NO TRANSLATION WORK EXCEPT IF YOU ARE WILLING TO DO DOUBLE WORK.
+Translations are updated there: https://www.Transifex.com/borgbase/vorta/
-Translations are updated there: https://www.transifex.com/borgbase/vorta/
+### Policy for Translations
-### Policy for translations
-
-- no google translate or other automated translation.
-- only native or as-good-as-native speakers should translate.
-- as there is a need for continued maintenance, a translator should be also a
+- No google translate or other automated translation.
+- Only native or as-good-as-native speakers should translate.
+- As there is a need for continued maintenance, a translator should be also a
user of vorta, having some own interest in the translation (one-time
- translations are not that helpful if there is noone updating them regularly)
-- a translation must have >90% translated strings. if a translation falls
+ translations are not that helpful if there is no one updating them regularly)
+- A translation must have >90% translated strings. If a translation falls
and stays below that for a longer time, it will not be used by vorta and
ultimately, it will get removed from the repository also.
-### Adding a new language
+### Adding a New Language
- Only add a new language if you are willing to also update the translation
in future, when new strings are added and existing strings change.
-- Request a new language via transifex.
-- TODO: add notes here what the maintainer has to do
+- Request a new language by opening a new issue on Github. We will then add it on Transifex.
-### Updating a language
+### Updating a Language
- Please only work on a translation if you are a native speaker or you have
similar language skills.
-- Edit the language on transifex.
+- Open a new issue on Github.
+- Edit the language on Transifex.
-### Data Flow to/from transifex
+### Data Flow to/from Transifex
-- extract: make translations-from-source
-- push: make translations-push
-- pull: make translations-pull
-- compile: make translations-to-qm
+- Extract from source files: `make translations-from-source`
+- Push to Transifex: `make translations-push`
+- Pull finished translations from Transifex: `make translations-pull`
+- Compile: `make translations-to-qm`
+### Notes for Developers
-### Notes for developers
-
-- original strings in .ui and .py must be American English (en_US)
-- in English, not translated:
-
+- Original strings in `.ui` and `.py` must be American English (en_US) and ASCII.
+- In English, not translated:
- log messages (log file as well as log output on console or elsewhere)
- other console output, print().
- docs
- py source code, comments, docstrings
-- translated:
+- Translated:
- GUI texts / messages
-- in Qt (sub)classes, use self.tr("English string"), scope will
+
+- In Qt (sub)classes, use self.tr("English string"), scope will
be the instance class name.
-- elsewhere use vorta.i18n.translate("scopename", "English string")
-- to only mark for string extraction, but not immediately translate,
+- Elsewhere use vorta.i18n.translate("scopename", "English string")
+- To only mark for string extraction, but not immediately translate,
use vorta.i18n.trans_late function.
Later, to translate, use vorta.i18n.translate (giving same scope).
+
+### Style Guide/Glossary
+
+- Headings, buttons and dropdowns are titleized: "Apply Changes"
+- Field labels (same or next line) end with a colon and are titleized. "Allowed Networks:"
+- No full stop `.` at the end of short labels, but when it's a full sentence.
+- If something is in progress, use three dots (no ellipsis): "Starting backup..."
+- **Repo/repository** = local or remote folder where Borg stores files.
+- **Archive** (not snapshot) = result of `borg create` execution, an identifier to find a
+ collection of files in a repo, as they existed at a past point in time.
### Required Software
To successfully run the translation-related Makefile targets, the translations
maintainer needs:
-- make tool
-- pylupdate5
-- lrelease
-- transifex-client pypi package
- (should be already there via requirements.d/dev.txt)
+- `make` tool
+- `pylupdate5` (from PyQt)
+- `lrelease` (from Qt package)
+- `tx` Transifex client (PyPI package `transifex-client`, contained in requirements.d/dev.txt)
-Debian 9 "Stretch":
+Install on Debian 9 "Stretch":
+```
+$ apt install qttools5-dev-tools pyqt5-dev-tools
+```
-apt install qttools5-dev-tools pyqt5-dev-tools
+Install on macOS via Homebrew:
+```
+$ cd requirements.d && brew bundle
+```
diff --git a/src/vorta/assets/UI/archivetab.ui b/src/vorta/assets/UI/archivetab.ui
index ffa7c97b..604a70d9 100644
--- a/src/vorta/assets/UI/archivetab.ui
+++ b/src/vorta/assets/UI/archivetab.ui
@@ -94,7 +94,7 @@ font-weight: bold;
- Mounted
+ Mount Point
@@ -331,7 +331,7 @@ font-weight: bold;
- annual archives.
+ annual archivestrue
@@ -438,9 +438,6 @@ font-weight: bold;
color: grey
-
- TextLabel
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
@@ -476,9 +473,6 @@ font-weight: bold;
color: grey
-
- TextLabel
- 1
diff --git a/src/vorta/assets/UI/mainwindow.ui b/src/vorta/assets/UI/mainwindow.ui
index 931cc8dd..3552c7eb 100644
--- a/src/vorta/assets/UI/mainwindow.ui
+++ b/src/vorta/assets/UI/mainwindow.ui
@@ -24,247 +24,253 @@
-
-
-
- 12
+
+
+
+ 12
+
+
+ 0
+
+
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+ Current Profile:
+
+
+
+
+
+
+
+ 300
+ 0
+
+
+
+
+
+
+
+ Rename Profile
+
+
+
+ :/icons/edit.svg:/icons/edit.svg
+
+
+
+ 16
+ 16
+
+
+
+
+
+
+
+ Delete Profile
+
+
+ ...
+
+
+
+ :/icons/trash.svg:/icons/trash.svg
+
+
+
+
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
+ 4
+
+
+ false
+
+
+ false
+
+
+
+
+ 0
+ 0
+
-
- 0
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
- Current Profile:
-
-
-
-
-
-
-
- 300
- 0
-
-
-
-
-
-
-
-
- :/icons/edit.svg:/icons/edit.svg
-
-
-
- 16
- 16
-
-
-
-
-
-
-
- ...
-
-
-
- :/icons/trash.svg:/icons/trash.svg
-
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
-
- 4
-
-
- false
-
-
- false
-
-
+
+ Repository
+
+
+
+
+ Sources
+
+
+
+
+ Schedule
+
+
+
+
+ Archives
+
+
+
+
+ Misc
+
+
+
+
+
+
+
+
-
+ 00
-
- Repository
-
+
+
+ 0
+ 55
+
+
+
+
+ 11
+
+
+
+
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+ true
+
-
-
- Sources
-
+
+
+
+
+ false
+
+
+
+ 11
+
+
+
+ false
+
+
+ Cancel
+
+
+ false
+
-
-
- Schedule
-
+
+
+
+
+ true
+
+
+
+
+
+
+
+ 255
+ 151
+ 41
+
+
+
+
+
+
+
+
+ 255
+ 151
+ 41
+
+
+
+
+
+
+
+
+ 220
+ 220
+ 220
+
+
+
+
+
+
+
+ 0
+
+
+ true
+
-
-
- Archives
-
+
+
+
+
+ true
+
+
+ Start Backup
+
+
+ false
+
-
-
- Misc
-
-
-
-
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 0
- 55
-
-
-
-
- 11
-
-
-
-
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
- true
-
-
-
-
-
-
- false
-
-
-
- 11
-
-
-
- false
-
-
- Cancel
-
-
- false
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
- 255
- 151
- 41
-
-
-
-
-
-
-
-
- 255
- 151
- 41
-
-
-
-
-
-
-
-
- 220
- 220
- 220
-
-
-
-
-
-
-
- 0
-
-
- true
-
-
-
-
-
-
- true
-
-
- Start Backup
-
-
- false
-
-
-
-
-
-
+
+
+
+
diff --git a/src/vorta/assets/UI/profileadd.ui b/src/vorta/assets/UI/profileadd.ui
index ff064d3d..f4c0920a 100644
--- a/src/vorta/assets/UI/profileadd.ui
+++ b/src/vorta/assets/UI/profileadd.ui
@@ -16,9 +16,6 @@
0
-
- Dialog
-
diff --git a/src/vorta/assets/UI/repoadd.ui b/src/vorta/assets/UI/repoadd.ui
index cd03369b..4f4b18b0 100644
--- a/src/vorta/assets/UI/repoadd.ui
+++ b/src/vorta/assets/UI/repoadd.ui
@@ -7,12 +7,9 @@
00555
- 277
+ 281
-
- Dialog
- true
@@ -78,7 +75,7 @@
...
-
+ :/icons/folder-open.svg:/icons/folder-open.svg
@@ -89,7 +86,7 @@
...
-
+ :/icons/globe.svg:/icons/globe.svg
@@ -116,7 +113,7 @@
- Password
+ Password:
diff --git a/src/vorta/assets/UI/repotab.ui b/src/vorta/assets/UI/repotab.ui
index 95d7ed79..dc38494d 100644
--- a/src/vorta/assets/UI/repotab.ui
+++ b/src/vorta/assets/UI/repotab.ui
@@ -29,7 +29,7 @@
- QLayout::SetNoConstraint
+ QLayout::SetMinimumSizeQFormLayout::ExpandingFieldsGrow
@@ -333,6 +333,9 @@
+
+ QLayout::SetNoConstraint
+ QFormLayout::ExpandingFieldsGrow
diff --git a/src/vorta/assets/UI/scheduletab.ui b/src/vorta/assets/UI/scheduletab.ui
index b515fbe6..76c42b69 100644
--- a/src/vorta/assets/UI/scheduletab.ui
+++ b/src/vorta/assets/UI/scheduletab.ui
@@ -32,7 +32,7 @@ font-weight: bold;
}
- 0
+ 3
@@ -50,7 +50,7 @@ font-weight: bold;
-
+ :/icons/clock-o.svg:/icons/clock-o.svg
@@ -60,6 +60,9 @@ font-weight: bold;
2
+
+ 0
+
@@ -77,7 +80,7 @@ font-weight: bold;
- Backup manually.
+ Backup manually
@@ -137,7 +140,7 @@ font-weight: bold;
- minutes past the hour.
+ minutes past the hour
@@ -217,7 +220,7 @@ font-weight: bold;
- weeks.
+ weeks
@@ -244,7 +247,7 @@ font-weight: bold;
- Prune old Archives after each backup.
+ Prune old Archives after each backupfalse
@@ -364,13 +367,16 @@ font-weight: bold;
-
+ :/icons/wifi.svg:/icons/wifi.svgNetworks
+
+ 0
+
@@ -393,13 +399,16 @@ font-weight: bold;
-
+ :/icons/tasks.svg:/icons/tasks.svgLog
+
+ 0
+
@@ -455,13 +464,16 @@ font-weight: bold;
-
+ :/icons/terminal.svg:/icons/terminal.svgShell Commands
+
+ 0
+
@@ -484,7 +496,7 @@ font-weight: bold;
- Pre-backup command to run BEFORE backups.
+ Pre-backup command to run BEFORE backups
@@ -494,7 +506,7 @@ font-weight: bold;
font-family:'Courier';
- Post-backup command to run AFTER backups.
+ Post-backup command to run AFTER backups
@@ -530,7 +542,7 @@ font-weight: bold;
-
+
diff --git a/src/vorta/assets/UI/sourcetab.ui b/src/vorta/assets/UI/sourcetab.ui
index 6d871c35..e88f91ae 100644
--- a/src/vorta/assets/UI/sourcetab.ui
+++ b/src/vorta/assets/UI/sourcetab.ui
@@ -17,7 +17,7 @@
- Source folders and files to back up
+ Source Folders and Files to Back Up:
@@ -74,7 +74,7 @@
- <html><head/><body><p>Exclude Patterns (<a href="https://borgbackup.readthedocs.io/en/stable/usage/help.html#borg-help-patterns"><span style=" text-decoration: underline; color:#0000ff;">more</span></a>)</p></body></html>
+ <html><head/><body><p>Exclude Patterns (<a href="https://borgbackup.readthedocs.io/en/stable/usage/help.html#borg-help-patterns"><span style=" text-decoration: underline; color:#0000ff;">more</span></a>):</p></body></html>true
@@ -84,7 +84,7 @@
- Exclude If Present (exclude folders with these files)
+ Exclude If Present (exclude folders with these files):
diff --git a/src/vorta/assets/UI/sshadd.ui b/src/vorta/assets/UI/sshadd.ui
index 97bd07e1..a5286d2d 100644
--- a/src/vorta/assets/UI/sshadd.ui
+++ b/src/vorta/assets/UI/sshadd.ui
@@ -10,9 +10,6 @@
286
-
- Dialog
-
diff --git a/src/vorta/borg/check.py b/src/vorta/borg/check.py
index 2dd1819e..aac38549 100644
--- a/src/vorta/borg/check.py
+++ b/src/vorta/borg/check.py
@@ -8,7 +8,7 @@ class BorgCheckThread(BorgThread):
def started_event(self):
self.app.backup_started_event.emit()
- self.app.backup_log_event.emit(self.tr('Starting consistency check..'))
+ self.app.backup_log_event.emit(self.tr('Starting consistency check...'))
def finished_event(self, result):
self.app.backup_finished_event.emit(result)
diff --git a/src/vorta/borg/create.py b/src/vorta/borg/create.py
index 6d9b3155..019fc9fd 100644
--- a/src/vorta/borg/create.py
+++ b/src/vorta/borg/create.py
@@ -133,7 +133,7 @@ class BorgCreateThread(BorgThread):
ret['message'] = trans_late('messages', 'Pre-backup command returned non-zero exit code.')
return ret
- ret['message'] = trans_late('messages', 'Starting backup..')
+ ret['message'] = trans_late('messages', 'Starting backup...')
ret['ok'] = True
ret['cmd'] = cmd
diff --git a/src/vorta/borg/extract.py b/src/vorta/borg/extract.py
index 5db2c5d0..176a6bfd 100644
--- a/src/vorta/borg/extract.py
+++ b/src/vorta/borg/extract.py
@@ -8,7 +8,7 @@ class BorgExtractThread(BorgThread):
def started_event(self):
self.app.backup_started_event.emit()
- self.app.backup_log_event.emit(self.tr('Downloading files from archive..'))
+ self.app.backup_log_event.emit(self.tr('Downloading files from archive...'))
def finished_event(self, result):
self.app.backup_finished_event.emit(result)
diff --git a/src/vorta/borg/list_archive.py b/src/vorta/borg/list_archive.py
index 294fb2f9..402a1fb9 100644
--- a/src/vorta/borg/list_archive.py
+++ b/src/vorta/borg/list_archive.py
@@ -8,7 +8,7 @@ class BorgListArchiveThread(BorgThread):
def started_event(self):
self.app.backup_started_event.emit()
- self.app.backup_log_event.emit(self.tr('Getting archive content..'))
+ self.app.backup_log_event.emit(self.tr('Getting archive content...'))
def finished_event(self, result):
self.app.backup_finished_event.emit(result)
diff --git a/src/vorta/i18n/ts/vorta.de.ts b/src/vorta/i18n/ts/vorta.de.ts
index b8d0469a..e0d27de4 100644
--- a/src/vorta/i18n/ts/vorta.de.ts
+++ b/src/vorta/i18n/ts/vorta.de.ts
@@ -78,135 +78,120 @@
AddRepository
-
- Dialog
- Dialog
-
-
-
+ Initialize New Backup RepositoryInitialisiere Neues Backup-Repository
-
+ Repository URL:Repository-URL:
-
+ csvis8xq@csvis8xq.repo.borgbase.com:repocsvis8xq@csvis8xq.repo.borgbase.com:repo
-
+ Choose a local path as repository.Wähle einen lokalen Pfad als Repository.
-
+ ......
-
+ Encryption:Verschlüsselung:
-
- Password
- Passwort
-
-
-
+ SSH Key:SSH-Schlüssel:
-
+ Automatically choose SSH Key (default)SSH-Schlüssel automatisch auswählen (Standardeinstellung)
-
+ AddHinzufügen
-
+ CancelAbbrechen
+
+
+ Password:
+ Passwort:
+ ArchiveTab
-
+ Archives for %sArchive für %s
-
+ ArchivesArchive
-
+ Preview: %sVorschau: %s
-
+ Error in archive name template.Fehler in der Archiv-Namens-Vorlage.
-
+ Pruning finished.Ausdünnen beendet.
-
+ Refreshed archives.Archive aufgefrischt.
-
+ Choose Mount PointEinhängepunkt auswählen
-
+ Mounted successfully.Erfolgreich eingehängt.
-
- Unmount
- Unmount
+
+ Mount point not active.
+ Einhängepunkt nicht aktive.
-
- Mount point not active. Try restarting Vorta.
- Einhängepunkt nicht aktiv. Versuche, Vortra neu zu starten.
-
-
-
+ Un-mounted successfully.Erfolgreich ausgehängt.
-
- Mount
- Einhängen
-
-
-
+ Select an archive to restore first.Zuerst ein Archiv zum Wiederherstellen auswählen.
-
+ Choose Extraction PointExtrahierungs-Punkt auswählen
@@ -215,8 +200,8 @@
BorgCheckThread
- Starting consistency check..
- Starte Konsistenz-Prüfung..
+ Starting consistency check...
+ Starte Konsistenz-Prüfung...
@@ -234,16 +219,16 @@
BorgExtractThread
-
-
- Downloading files from archive..
- Lade Dateien aus dem Archiv herunter..
- Restored files from archive.Dateien aus Archiv wieder hergestellt.
+
+
+ Downloading files from archive...
+ Lade Dateien aus dem Archiv herunter...
+ BorgInfoThread
@@ -263,16 +248,16 @@
BorgListArchiveThread
-
-
- Getting archive content..
- Hole Archiv-Inhalt..
- Done getting archive content.Archiv-Inhalt holen erledigt.
+
+
+ Getting archive content...
+ Hole Archiv-Inhalt...
+ BorgListRepoThread
@@ -319,7 +304,7 @@
BorgUmountThread
-
+ Unmounting archive...Hänge Archiv aus...
@@ -327,7 +312,7 @@
Dialog
-
+ DialogDialog
@@ -357,60 +342,60 @@
Extrahieren
-
+ Add Backup ProfileBackup-Profil hinzufügen
-
+
+ <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 local storage device.</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>Datensicherungs-Profile erlauben granuläre Datensicherungen von verschiedenen Quellen zu verschiedenen Zielen. Sie könnten z.B. wichtige Dokumente in ein entferntes Repository über WLAN sichern und eine volle Datensicherung auf ein lokales Speichermedium machen.</p><p>Repositories und SSH-Schlüssel werden zwischen Profilen geteilt. Quell-Ordner, aktives Ziel-Repo, erlaubte Netzwerke, Ausdünnen, Validierung und Planung sind pro Profil.</p></body></html>
+
+
+ Profile NameProfil-Name
-
+ Generate SSH KeySSH-Schlüssel erzeugen
-
+ Key Format:Schlüssel-Format:
-
+ Key Length:Schlüssel-Länge:
-
+ <html><head/><body><p>2048 or 4096 for RSA, 384 or 521 for ECDSA. Fixed for Ed25519. <a href="https://stribika.github.io/2015/01/04/secure-secure-shell.html"><span style=" text-decoration: underline; color:#0000ff;">More</span></a>.</p></body></html><html><head/><body><p>2048 oder 4096 für RSA, 384 oder 521 für ECDSA. Fest für Ed25519. <a href="https://stribika.github.io/2015/01/04/secure-secure-shell.html"><span style=" text-decoration: underline; color:#0000ff;">Mehr</span></a>.</p></body></html>
-
+ Output File:Ausgabe-Datei:
-
+ Don't change this if you want SSH to automatically find the key.Dies nicht ändern, wenn Sie wollen, daß SSH automatisch den Key findet.
-
+ CloseSchließen
-
+ Generate and copy to ClipboardErzeugen und auf Zwischenablage kopieren
-
-
- <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 local storage device.</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>Datensicherungs-Profile erlauben granuläre Datensicherungen von verschiedenen Quellen zu verschiedenen Zielen. Sie könnten z.B. wichtige Dokumente in ein entferntes Repository über WLAN sichern und eine volle Datensicherung auf ein lokales Speichermedium machen.</p><p>Repositories und SSH-Schlüssel werden zwischen Profilen geteilt. Quell-Ordner, aktives Ziel-Repo, erlaubte Netzwerke, Ausdünnen, Validierung und Planung sind pro Profil.</p></body></html>
- ExistingRepoWindow
@@ -448,122 +433,112 @@
Dauer
-
+ NameName
-
+ ExtractExtrahieren
-
+ MountEinhängen
-
+ CheckPrüfen
-
+ PruneAusdünnen
-
+ RefreshAuffrischen
-
+ <html><head/><body><p>To mount archives, first install "FUSE for macOS" from <a href="https://osxfuse.github.io/"><span style=" text-decoration: underline; color:#0000ff;">here</span></a>.</p></body></html><html><head/><body><p>Um Archive einzuhängen, installieren Sie zu erst "FUSE for macOS" von <a href="https://osxfuse.github.io/"><span style=" text-decoration: underline; color:#0000ff;">hier</span></a>.</p></body></html>
-
+ Prune Options and Archive NamingAusdünnungs-Optionen und Archiv-Namensgebung
-
+ <html><head/><body><p>Pruning removes older archives. You can choose the number of hourly, daily, etc. archives to preserve. Usually you will keep more newer and fewer old archives. Read <a href="https://borgbackup.readthedocs.io/en/stable/usage/prune.html"><span style=" text-decoration: underline; color:#0000ff;">more</span></a>.</p></body></html><html><head/><body><p>Ausdünnen entfernt ältere Archive. Sie können die Anzahl der stündlichen, täglichen, etc. Archive wählen, die Sie behalten möchten. Üblicherweise werden Sie mehr neue und weniger alte Archive behalten. <a href="https://borgbackup.readthedocs.io/en/stable/usage/prune.html"><span style=" text-decoration: underline; color:#0000ff;">Mehr</span></a> lesen.</p></body></html>
-
+ KeepBehalte
-
+ Use -1 for unlimited.Benutze -1 für nicht begrenzt.
-
+ hourly, stündliche,
-
+ daily, tägliche,
-
+ weekly, wöchentliche,
-
+ monthly andmonatliche und
-
- annual archives.
- jährliche Archive.
-
-
-
+ No matter what, keep all archives of the last:Außerdem, behalte alle Archive der letzten:
-
+ 24H, 1d, 52w, 12m, 1y24H, 1d, 52w, 12m, 1y
-
+ Archive Name:Archiv-Name:
-
+ Available variables: hostname, profile_id, profile_slug, now, utc_now, userVerfügbare Variablen: hostname, profile_id, profile_slug, now, utc_now, user
-
+ {hostname}-{profile_slug}-{hostname}-{profile_slug}-
-
- TextLabel
- TextLabel
-
-
-
+ {hostname}-{profile_slug}-{now:%Y-%m-%dT%H:%M:%S}{hostname}-{profile_slug}-{now:%Y-%m-%dT%H:%M:%S}
-
+ Prune Prefix:Ausdünnungs-Präfix:
@@ -583,77 +558,77 @@
<html><head/><body><p>(<a href="https://github.com/borgbase/vorta/issues/new/choose"><span style=" text-decoration: underline; color:#0000ff;">Melden</span></a> eines Fehlers)</p></body></html>
-
- SSH Key:
- SSH-Schlüssel:
-
-
-
- Select Backup Destination
- Wähle Datensicherungs-Ziel
-
-
-
- Unlink Repository (This doesn't delete any data. You can always add a repo again later.)
- Repository abkoppeln (Dies löscht keinerlei Daten. Sie können jederzeit ein Repo später wieder hinzufügen.)
-
-
-
- ...
- ...
-
-
-
- To securely access remote repositories. Keep default to use all your existing keys. Or create new key.
- Um sicher auf entfernte Repositories zuzugreifen. Behalte die Standardeinstellung, um alle Ihre existierenden Schlüssel zu verwenden. Oder erzeuge neuen Schlüssel.
-
-
-
- <html><head/><body><p>Remote or local backup repository. For simple and secure backup hosting, try <a href="https://www.borgbase.com/?utm_source=vorta&utm_medium=app"><span style=" text-decoration: underline; color:#0000ff;">BorgBase</span></a>.</p></body></html>
- <html><head/><body><p>Entferntes oder lokales Datensicherungs-Repository. Probieren Sie <a href="https://www.borgbase.com/?utm_source=vorta&utm_medium=app"><span style=" text-decoration: underline; color:#0000ff;">BorgBase</span></a> für einfaches und sicheres Hosting von Datensicherungen.</p></body></html>
-
-
-
- Compression:
- Kompression:
-
-
-
- Copy public SSH key to clipboard.
- Kopiere öffentlichen SSH-Schlüssel auf Zwischenablage.
-
-
-
- Copy
- Kopieren
-
-
-
+ Repository:Repository:
-
+
+ <html><head/><body><p>Remote or local backup repository. For simple and secure backup hosting, try <a href="https://www.borgbase.com/?utm_source=vorta&utm_medium=app"><span style=" text-decoration: underline; color:#0000ff;">BorgBase</span></a>.</p></body></html>
+ <html><head/><body><p>Entferntes oder lokales Datensicherungs-Repository. Probieren Sie <a href="https://www.borgbase.com/?utm_source=vorta&utm_medium=app"><span style=" text-decoration: underline; color:#0000ff;">BorgBase</span></a> für einfaches und sicheres Hosting von Datensicherungen.</p></body></html>
+
+
+
+ Select Backup Destination
+ Wähle Datensicherungs-Ziel
+
+
+
+ Unlink Repository (This doesn't delete any data. You can always add a repo again later.)
+ Repository abkoppeln (Dies löscht keinerlei Daten. Sie können jederzeit ein Repo später wieder hinzufügen.)
+
+
+
+ ...
+ ...
+
+
+
+ SSH Key:
+ SSH-Schlüssel:
+
+
+
+ Copy public SSH key to clipboard.
+ Kopiere öffentlichen SSH-Schlüssel auf Zwischenablage.
+
+
+
+ Copy
+ Kopieren
+
+
+
+ To securely access remote repositories. Keep default to use all your existing keys. Or create new key.
+ Um sicher auf entfernte Repositories zuzugreifen. Behalte die Standardeinstellung, um alle Ihre existierenden Schlüssel zu verwenden. Oder erzeuge neuen Schlüssel.
+
+
+
+ Compression:
+ Kompression:
+
+
+ <html><head/><body><p>Compression used for new data. Can be changed and doesn't affect deduplication. Read <a href="https://borgbackup.readthedocs.io/en/stable/usage/help.html#borg-help-compression"><span style=" text-decoration: underline; color:#0000ff;">more</span></a>.</p></body></html><html><head/><body><p>Kompression, die für neue Daten benutzt wird. Kann geändert werden und beeinflusst nicht die Deduplikation. Lesen Sie <a href="https://borgbackup.readthedocs.io/en/stable/usage/help.html#borg-help-compression"><span style=" text-decoration: underline; color:#0000ff;">mehr</span></a>.</p></body></html>
-
+ Encryption:Verschlüsselung:
-
+ Original Size:Ursprüngliche Größe:
-
+ Deduplicated Size:Deduplizierte Größe:
-
+ Compressed Size:Komprimierte Größe:
@@ -663,130 +638,95 @@
Planung
-
- Backup manually.
- Manuell sichern
-
-
-
+ Backup every Sichern alle
-
+ hours atStunden, um
-
- minutes past the hour.
- Minuten nach der vollen Stunde.
-
-
-
+ Backup daily atTäglich sichern um
-
+ Validate repository data everyRepository validieren alle
-
- weeks.
- Wochen.
-
-
-
- Prune old Archives after each backup.
- Alte Archive nach jedem Backup ausdünnen.
-
-
-
+ ApplyAnwenden
-
+ Next Backup:Nächstes Backup:
-
+ OffAus
-
+ NetworksNetzwerke
-
+ Allowed Networks:Erlaubte Netzwerke:
-
+ LogProtokoll
-
+ TimeZeit
-
+ CategoryKategorie
-
+ SubcommandUnter-Kommando
-
+ RepositoryRepository
-
+ ReturncodeReturncode
-
+ Shell CommandsShell-Kommandos
-
+ Run custom shell commands before and after each backup. The actual backup and post-backup command will only run, if the pre-backup command exits without error (return code 0).Kundenspezifische Shell-Kommandos vor und nach jeder Datensicherung ausführen. Das backup- und post-backup-Kommando wird nur ausgeführt, wenn das pre-backup-Kommando sich ohne Fehler beendet hat (rc 0).
-
- Pre-backup command to run BEFORE backups.
- pre-backup-Kommando, das VOR den Datensicherungen ausgeführt wird.
-
-
-
- Post-backup command to run AFTER backups.
- post-backup-Kommando, das NACH den Datensicherungen ausgeführt wird.
-
-
-
+ <html><head/><body><p>Available env variables: <span style=" font-family:'Courier';">$repo_url, $profile_name, $profile_slug, $returncode</span></p></body></html><html><head/><body><p>Verfügbare Umgebungs-Variablen: <span style=" font-family:'Courier';">$repo_url, $profile_name, $profile_slug, $returncode</span></p></body></html>
-
-
- Source folders and files to back up
- Zu sichernde Quell-Ordner und -Dateien
- Add Folder
@@ -802,16 +742,6 @@
RemoveEntfernen
-
-
- <html><head/><body><p>Exclude Patterns (<a href="https://borgbackup.readthedocs.io/en/stable/usage/help.html#borg-help-patterns"><span style=" text-decoration: underline; color:#0000ff;">more</span></a>)</p></body></html>
- <html><head/><body><p>Ausschluss-Muster (<a href="https://borgbackup.readthedocs.io/en/stable/usage/help.html#borg-help-patterns"><span style=" text-decoration: underline; color:#0000ff;">mehr</span></a>)</p></body></html>
-
-
-
- Exclude If Present (exclude folders with these files)
- Ausschließen, Wenn Vorhanden (schließe Ordner mit diesen Dateien aus)
- **/.DS_Store
@@ -822,21 +752,76 @@
.nobackup.nobackup
+
+
+ annual archives
+ jährliche Archive
+
+
+
+ Backup manually
+ Manuell sichern
+
+
+
+ minutes past the hour
+ Minuten nach der vollen Stunde
+
+
+
+ weeks
+ Wochen
+
+
+
+ Prune old Archives after each backup
+ Alte Archive nach jedem Backup ausdünnen
+
+
+
+ Pre-backup command to run BEFORE backups
+ pre-backup-Kommando, das VOR den Datensicherungen ausgeführt wird
+
+
+
+ Post-backup command to run AFTER backups
+ post-backup-Kommando, das NACH den Datensicherungen ausgeführt wird
+
+
+
+ Source Folders and Files to Back Up:
+ Zu sichernde Quell-Ordner und -Dateien:
+
+
+
+ <html><head/><body><p>Exclude Patterns (<a href="https://borgbackup.readthedocs.io/en/stable/usage/help.html#borg-help-patterns"><span style=" text-decoration: underline; color:#0000ff;">more</span></a>):</p></body></html>
+ <html><head/><body><p>Ausschluss-Muster (<a href="https://borgbackup.readthedocs.io/en/stable/usage/help.html#borg-help-patterns"><span style=" text-decoration: underline; color:#0000ff;">mehr</span></a>):</p></body></html>
+
+
+
+ Exclude If Present (exclude folders with these files):
+ Ausschließen, Wenn Vorhanden (schließe Ordner mit diesen Dateien aus):
+
+
+
+ Mount Point
+ Einhängepunkt
+ MainWindow
-
+ + Add New Profile+ Neues Profil hinzufügen
-
+ Backup in progress.Backup läuft
-
+ Task cancelledAufgabe abgebrochen
@@ -851,55 +836,65 @@
Aktuelles Profil:
-
+ ......
-
+ RepositoryRepository
-
+ SourcesQuellen
-
+ ScheduleZeitplan
-
+ ArchivesArchive
-
+ MiscDiverses
-
+ CancelAbbrechen
-
+ Start BackupDatensicherung starten
-
+ LatestNeuestes
-
+ Reset AppApp zurücksetzen
+
+
+ Rename Profile
+ Profil umbenennen
+
+
+
+ Delete Profile
+ Profil entfernen
+ RepoTab
@@ -1033,33 +1028,33 @@
TrayMenu
-
+
+ Vorta for Borg Backup
+ Vorta for Borg Backup
+
+
+ Backup in ProgressDatensicherung läuft
-
+ Cancel BackupDatensicherung abbrechen
-
+ Next Task: %sNächste Aufgabe: %s
-
+ Backup NowDatensicherung starten
-
- Settings
- Einstellungen
-
-
-
- Exit
+
+ QuitBeenden
@@ -1144,47 +1139,47 @@
Pre-backup-Kommando hat einen Return-Code ungleich Null zurückgegeben.
-
- Starting backup..
- Starte Datensicherung..
-
-
-
+ No active Borg mounts found.Keine aktiven Borg-Einhängepunkte gefunden.
+
+
+ Starting backup...
+ Starte Datensicherung...
+ settings
-
- Use light system tray icon (applies after restart, useful for dark themes).
- Helles System-Tray-Icon benutzen (wird nach Neustart angewandt, nützlich für dunkle Themes).
+
+ Use light system tray icon (applies after restart, useful for dark themes)
+ Helles System-Tray-Icon benutzen (wird nach Neustart angewandt, nützlich für dunkle Themes)
-
- Display notifications when background tasks fail.
- Benachrichtigungen anzeigen, wenn Hintergrund-Aufgaben fehlschlagen.
+
+ Display notifications when background tasks fail
+ Benachrichtigungen anzeigen, wenn Hintergrund-Aufgaben fehlschlagen
-
- Also notify about successful background tasks.
- Auch über erfolgreiche Hintergrund-Aufgaben benachrichtigen.
+
+ Also notify about successful background tasks
+ Auch über erfolgreiche Hintergrund-Aufgaben benachrichtigen
-
- Add Vorta to Login Items in Preferences > Users and Groups > Login Items.
- Füge Vorta zu Login Items in Preferences > Users and Groups > Login Items hinzu.
+
+ Check for updates on startup
+ Prüfe beim Start auf Aktualisierungen
-
- Check for updates on startup.
- Prüfe beim Start auf Aktualisierungen.
+
+ Include pre-release versions when checking for updates
+ Auch Vorab-Versionen mit einbeziehen bei der Prüfung auf Aktualisierungen
-
- Include pre-release versions when checking for updates.
- Auch Vorab-Versionen mit einbeziehen bei der Prüfung auf Aktualisierungen.
+
+ Automatically start Vorta at login
+ Starte Vorta automatisch bei der Anmeldung
\ No newline at end of file
diff --git a/src/vorta/models.py b/src/vorta/models.py
index 8f20238f..f9829256 100644
--- a/src/vorta/models.py
+++ b/src/vorta/models.py
@@ -193,17 +193,17 @@ def get_misc_settings():
'value': False,
'type': 'checkbox',
'label': trans_late('settings',
- 'Use light system tray icon (applies after restart, useful for dark themes).')
+ 'Use light system tray icon (applies after restart, useful for dark themes)')
},
{
'key': 'enable_notifications', 'value': True, 'type': 'checkbox',
'label': trans_late('settings',
- 'Display notifications when background tasks fail.')
+ 'Display notifications when background tasks fail')
},
{
'key': 'enable_notifications_success', 'value': False, 'type': 'checkbox',
'label': trans_late('settings',
- 'Also notify about successful background tasks.')
+ 'Also notify about successful background tasks')
}
]
if sys.platform == 'darwin':
@@ -211,17 +211,17 @@ def get_misc_settings():
{
'key': 'autostart', 'value': False, 'type': 'checkbox',
'label': trans_late('settings',
- 'Add Vorta to Login Items in Preferences > Users and Groups > Login Items.')
+ 'Automatically start Vorta at login')
},
{
'key': 'check_for_updates', 'value': True, 'type': 'checkbox',
'label': trans_late('settings',
- 'Check for updates on startup.')
+ 'Check for updates on startup')
},
{
'key': 'updates_include_beta', 'value': False, 'type': 'checkbox',
'label': trans_late('settings',
- 'Include pre-release versions when checking for updates.')
+ 'Include pre-release versions when checking for updates')
},
]