Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add Codespell workflow and fix some typo #1568

Merged
merged 6 commits into from
Nov 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Version 1.3.0 (2021-07-04)
* Merge PR: 'TempPasswordThread' object has no attribute 'isAlive', Thanks FMeinicke (https://github.com/bit-team/backintime/pull/1135)
* Merge PR: Keep permissions of an existing mountpoint from being overridden, Thanks bentolor (https://github.com/bit-team/backintime/pull/1058)
* Fix bug: YEAR missing in config (https://github.com/bit-team/backintime/issues/1023)
* Fix bug: SSH module didn't send identification string while checking if remote host is avilable (https://github.com/bit-team/backintime/issues/1030)
* Fix bug: SSH module didn't send identification string while checking if remote host is available (https://github.com/bit-team/backintime/issues/1030)

Version 1.2.1 (2019-08-25)
* Fix bug: TypeError in backintime.py if mount failed while running a snapshot (https://github.com/bit-team/backintime/issues/1005)
Expand All @@ -107,7 +107,7 @@ Version 1.2.0 (2019-04-27)
* Fix bug: configured cipher is not used with all ssh-commands (https://github.com/bit-team/backintime/issues/934)
* remove progressbar on systray icon until BiT has it's own icon (https://github.com/bit-team/backintime/issues/902)
* Fix bug: 'make test' fails because local SSH server is running on non-standard port (https://github.com/bit-team/backintime/issues/945)
* clearify 'nocache' option (https://github.com/bit-team/backintime/issues/857)
* clarify 'nocache' option (https://github.com/bit-team/backintime/issues/857)
* create a config-backup in root dir if backup is encrypted (https://github.com/bit-team/backintime/issues/556)
* Fix bug: 23:00 is missing in the list of every day hours (https://github.com/bit-team/backintime/issues/736)
* Fix bug: ssh-agent output changed (https://github.com/bit-team/backintime/issues/840)
Expand All @@ -116,7 +116,7 @@ Version 1.2.0 (2019-04-27)
* Fix bug: stat free space for snapshot folder instead of backintime folder (https://github.com/bit-team/backintime/issues/733)
* add contextmenu for logview dialog which can copy, exclude and decode lines
* move progressbar under statusbar
* Fix bug: backintime root crontab doesn't run; missinng line-feed 0x0A on last line (https://github.com/bit-team/backintime/issues/781)
* Fix bug: backintime root crontab doesn't run; missing line-feed 0x0A on last line (https://github.com/bit-team/backintime/issues/781)
* Fix bug: IndexError in inhibitSuspend (https://github.com/bit-team/backintime/issues/772)
* alleviate default exclude [Tt]rash* (https://github.com/bit-team/backintime/issues/759)
* enable high DPI scaling (https://github.com/bit-team/backintime/issues/732)
Expand All @@ -129,7 +129,7 @@ Version 1.2.0 (2019-04-27)
* Fix bug: Exception in FileInfo
* ask for restore-to path before confirm (https://github.com/bit-team/backintime/issues/678)
* fix 'Back in Time (root)' on wayland (https://github.com/bit-team/backintime/issues/640)
* sort int values in config nummerical instead if alphabetical (https://github.com/bit-team/backintime/issues/175#issuecomment-272941811)
* sort int values in config numerical instead if alphabetical (https://github.com/bit-team/backintime/issues/175#issuecomment-272941811)
* set timestamp directly after new snapshot (https://github.com/bit-team/backintime/issues/584)
* add shortcut CTRL+H for toggle show hidden files to fileselect dialog (https://github.com/bit-team/backintime/issues/378)
* add 'Edit user-callback' dialog
Expand Down Expand Up @@ -187,7 +187,7 @@ Version 1.2.0 (2019-04-27)
* Fix bug: BIT-root won't start from .desktop file (https://github.com/bit-team/backintime/issues/549)
* Fix bug: Keyring doesn't work with KDE Plasma5 (https://github.com/bit-team/backintime/issues/545)
* Fix bug: Qt4 built-in phrases where not translated (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=816197)
* Fix bug: configure ingnore unknown args (https://github.com/bit-team/backintime/issues/547)
* Fix bug: configure ignore unknown args (https://github.com/bit-team/backintime/issues/547)
* Fix bug: snapshots-list on command-line was not sorted
* Fix bug: SHA256 ssh-key fingerprint was not detected
* change default configure option to --no-fuse-group as Ubuntu >= 12.04 don't need fuse group-membership anymore
Expand All @@ -211,7 +211,7 @@ Version 1.1.24 (2017-11-07)

Version 1.1.22 (2017-10-28)
* fix bug: stat free space for snapshot folder instead of backintime folder (https://github.com/bit-team/backintime/issues/552733)
* backport bug fix: backintime root crontab doesn't run; missinng line-feed 0x0A on last line (https://github.com/bit-team/backintime/issues/552781)
* backport bug fix: backintime root crontab doesn't run; missing line-feed 0x0A on last line (https://github.com/bit-team/backintime/issues/552781)
* backport bug fix: can't open files with spaces in name (https://github.com/bit-team/backintime/issues/552552)

Version 1.1.20 (2017-04-09)
Expand Down Expand Up @@ -257,7 +257,7 @@ Version 1.1.10 (2016-01-09)
* Fix bug: PermissionError while deleting readonly files on sshfs mounted share (https://github.com/bit-team/backintime/issues/490)
* Add Nautilus-like shortcuts for navigating in file browser (https://github.com/bit-team/backintime/issues/483)
* speed up mounting of SSH+encrypted profiles
* Fix bug: creat new encrypted profiles with encfs >= 1.8.0 failed (https://github.com/bit-team/backintime/issues/477)
* Fix bug: create new encrypted profiles with encfs >= 1.8.0 failed (https://github.com/bit-team/backintime/issues/477)
* Fix bug: AttributeError in common/tools.py if keyring is missing (https://github.com/bit-team/backintime/issues/473)
* Fix bug: remote rename of 'new_snapshot' folder sometimes isn't recognized locally; rename local now (https://answers.launchpad.net/questions/271792)
* Move source code and bug tracking to GitHub
Expand All @@ -277,7 +277,7 @@ Version 1.1.8 (2015-09-28)
* run multiple smart-remove jobs in one screen session (https://launchpad.net/bugs/1487781)
* add error messages if PID file creation fail
* Fix bug: dbus exception if dbus systembus is not running
* Fix bug: depend on virtual package cron-daemon instead of cron for compatiblity with other cron implementations (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776856)
* Fix bug: depend on virtual package cron-daemon instead of cron for compatibility with other cron implementations (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776856)
* Fix bug: wasn't able to start from alternate install dir (https://launchpad.net/bugs/478689)
* Fix bug: wasn't able to start from source dir
* Add Warning about unsupported filesystems
Expand Down Expand Up @@ -326,9 +326,9 @@ Version 1.1.4 (2015-03-22)
* add confirm dialog before restoring (https://launchpad.net/bugs/438079)
* Fix bug: Wrong status text in the tray icon (https://launchpad.net/bugs/1429400)
* add option to run only one snapshot at a time
* Fix bug: restore permissions of lots of files made BackInTime unresposive (https://launchpad.net/bugs/1428423)
* Fix bug: restore permissions of lots of files made BackInTime unresponsive (https://launchpad.net/bugs/1428423)
* Fix bug: failed to restore file owner and group
* cache uuid in config so it doesn't fail if the device isn't pluged in (https://launchpad.net/bugs/1426881)
* cache uuid in config so it doesn't fail if the device isn't plugged in (https://launchpad.net/bugs/1426881)
* add warning about wrong Python version in configure
* prevent snapshots from being removed with restore and delete; show warning if restore and delete filesystem root (https://answers.launchpad.net/questions/262837)
* Fix bug: OSError in free_space; add alternate method to get free space
Expand Down Expand Up @@ -360,7 +360,7 @@ Version 1.1.0 (2015-01-15)
* automatically run in background if started with 'backintime --backup-job'
* fix typos and style warnings in manpages reported by Lintian (https://lintian.debian.org/full/jmw@debian.org.html#backintime_1.0.34-0.1)
* add exclude files by size (https://launchpad.net/bugs/823719)
* remove 'Auto Host/User/Profile-ID' as this is more confiusing than helping
* remove 'Auto Host/User/Profile-ID' as this is more confusing than helping
* Fix bug: check procname of pid-locks (https://launchpad.net/bugs/1341414)
* optional run 'rsync' with 'nocache' (https://launchpad.net/bugs/1344528)
* mark invalid exclude pattern with mode ssh-encrypted
Expand Down Expand Up @@ -432,11 +432,11 @@ Version 1.0.30 (2013-12-12)
* Fix bug: udev rule doesn't finish (https://bugs.launchpad.net/backintime/+bug/1249466)
* add symlink last_snapshot (https://bugs.launchpad.net/backintime/+bug/787118)
* add virtual package backintime-kde for PPA
* Fix multiple errors in PPA build process; reorganise updateversion.sh
* Fix multiple errors in PPA build process; reorganize updateversion.sh
* Fix bug: Mate and xfce desktop didn't show systray icon (https://bugs.launchpad.net/backintime/+bug/658424/comments/31)
* add option to run rsync with 'nice' or 'ionice' on remote host (https://bugs.launchpad.net/backintime/+bug/1240301)
* add Shutdown button to shutdown system after snapshot has finished (https://bugs.launchpad.net/backintime/+bug/838742)
* Fix bug: Ubuntu Lucid dosn't provide SecretServiceKeyring (https://bugs.launchpad.net/backintime/+bug/1243911)
* Fix bug: Ubuntu Lucid doesn't provide SecretServiceKeyring (https://bugs.launchpad.net/backintime/+bug/1243911)
* wrap long lines for syslog
* Fix bug: 'gksu backintime-gnome' failed with dbus.exceptions.DBusException

Expand Down Expand Up @@ -475,7 +475,7 @@ Version 1.0.26 (2013-09-07)
* deactivate 'Save Password' if no keyring is available
* use Password-cache for user-input too
* handle two Passwords
* add 'SSH encrypted': mount / with encfs reverse and sync encrypted with rsync. EXPERIMENTEL!
* add 'SSH encrypted': mount / with encfs reverse and sync encrypted with rsync. EXPERIMENTAL!
* add 'Local encrypted': mount encfs

Version 1.0.24 (2013-05-08)
Expand All @@ -486,7 +486,7 @@ Version 1.0.24 (2013-05-08)
* Fix bug: quote rsync remote path with spaces
* 'Save Password' default off to avoid problems with existing profiles
* if restore uid/gid failed try to restore at least gid
* SSH need to store permissions in seperate file with "Full rsync mode" because remote user might not be able to store ownership
* SSH need to store permissions in separate file with "Full rsync mode" because remote user might not be able to store ownership
* Fix bug: restore permission failed on "Full rsync mode"
* Fix bug: glib.GError: Unknown internal child: selection
* Fix bug: GtkWarning: Unknown property: GtkLabel.margin-top
Expand All @@ -513,12 +513,12 @@ Version 1.0.18 (2012-11-17)
* Map multiple arguments for gettext so they can be rearranged by translators

Version 1.0.16 (2012-11-15)
* Fix a package dependecy problem ... this time for good (https://bugs.launchpad.net/backintime/+bug/1077446)
* Fix a package dependency problem ... this time for good (https://bugs.launchpad.net/backintime/+bug/1077446)

Version 1.0.14 (2012-11-09)
* Fix a package dependecy problem
* Fix a package dependency problem

Versoin 1.0.12 (2012-11-08)
Version 1.0.12 (2012-11-08)
* Add links to: website, documentation, report a bug, answers, faq
* Use libnotify for gnome/kde4 notifications instead of gnome specific libraries
* Fix bug: https://bugs.launchpad.net/backintime/+bug/1059247
Expand Down Expand Up @@ -560,7 +560,7 @@ Version 1.0 (2010-10-16)
* fix xattr
* add continue on errors (https://bugs.launchpad.net/backintime/+bug/616299)
* add expert options: copy unsafe links & copy links
* "user-callback" replace "user.callback" and receive profile informations
* "user-callback" replace "user.callback" and receive profile information
* documentation: on-line only (easier to maintain)
* add error log and error log view dialog (Gnome & KDE4)
* merge with: lp:~dave2010/backintime/minor-edits
Expand Down Expand Up @@ -736,7 +736,7 @@ Version 0.9.8 (2009-02-20)
* unsafe links are ignored (that means that a link to a file/directory outside of include directories are ignored)
* KDE4: add copy to clipboard
* KDE4: sort files by name, size or date
* cron 5/10 minutes: replace mutiple lines with a single crontab line using divide (*/5 or */10)
* cron 5/10 minutes: replace multiple lines with a single crontab line using divide (*/5 or */10)
* cron: when called from cron redirect output (stdout & stderr) to /dev/null

Version 0.9.6 (2009-02-09)
Expand Down Expand Up @@ -800,7 +800,7 @@ Version 0.8.12 (2008-12-01)
* add German translation (Michael Wiedmann <mw@miwie.in-berlin.de>)
* add SnapshotNameDialog
* add Name/Remove snapshot in main toolbar
* change the way it detects if the mainwindow is the ative window (no dialogs)
* change the way it detects if the mainwindow is the active window (no dialogs)
* toolbars: show icons only
* update Spanish translation (Francisco Manuel García Claramonte <franciscomanuel.garcia@hispalinux.es>)

Expand Down Expand Up @@ -835,7 +835,7 @@ Version 0.8 (2008-11-07)
* add English help (docbook)
* add help button in main toolbar
* the application can be started with a 'path' to a folder or file as command line parameter
* when the application start, if it is already runnig pass its command line to the first instance (this allow a basic integration with file-managers - see README)
* when the application start, if it is already running pass its command line to the first instance (this allow a basic integration with file-managers - see README)
* bug fix: when the application was started a second time it raise the first application's window but not always focused

Version 0.7.4 (2008-11-03)
Expand Down
6 changes: 3 additions & 3 deletions common/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
import getpass
pwd = None

# Workaround: Mostly relevant on TravisCI but not exclusivley.
# Workaround: Mostly relevant on TravisCI but not exclusively.
# While unittesting and without regular invocation of BIT the GNU gettext
# class-based API isn't setup yet.
# The bigger problem with config.py is that it do use translatebale strings.
# The bigger problem with config.py is that it do use translatable strings.
# Strings like this do not belong into a config file or its context.
try:
_('Warning')
Expand Down Expand Up @@ -551,7 +551,7 @@ def setLanguage(self, language: str):
self.setStrValue('global.language', language if language else '')

def manual_starts_countdown(self) -> int:
"""Countdown value about how often the users startet the Back In Time
"""Countdown value about how often the users started the Back In Time
GUI.

It is an internal variable not meant to be used or manipulated be the
Expand Down
2 changes: 1 addition & 1 deletion common/configure
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ for v in "" "-v"; do
done
else
#else just call py.test-3 which will find test/test_*.py by itself
#py.test-3 has a nicer output so this is prefered over simple python3
#py.test-3 has a nicer output so this is preferred over simple python3
printf "\t${PYTEST} ${v}\n" >> ${MAKEFILE}
fi
printf "\n" >> ${MAKEFILE}
Expand Down
2 changes: 1 addition & 1 deletion common/diagnostics.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def collect_diagnostics():
)
elif isinstance(result['external-programs']['rsync'], dict):
# Rsync (>= 3.2.7)provided its information in JSON format.
# Remove some irrelevant informaton.
# Remove some irrelevant information.
for key in ['program', 'copyright', 'url', 'license', 'caveat']:
try:
del result['external-programs']['rsync'][key]
Expand Down
12 changes: 6 additions & 6 deletions common/doc-dev/2_localization.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Translation and localization (l10n) of Back In Time using Weblate
<sub>Feel free to [open issues](https://github.com/bit-team/backintime/issues) or contact the [maintenace team on the mailing list](https://mail.python.org/mailman3/lists/bit-dev.python.org/) if this text is difficult to understand or not helpful.</sub>
<sub>Feel free to [open issues](https://github.com/bit-team/backintime/issues) or contact the [maintenance team on the mailing list](https://mail.python.org/mailman3/lists/bit-dev.python.org/) if this text is difficult to understand or not helpful.</sub>

## Index

Expand Down Expand Up @@ -34,8 +34,8 @@ GitHub.
7. Check via `git status` or `git diff`. The file `messages.pot` and all `po`-files should be modified.
8. Commit.
9. Create PR and merge into "dev".
10. Weblate "Respository maintenance": Go to "Danger zone" and click on "Reset".
11. Weblate "Respository maintenance": "Unlock" the project.
10. Weblate "Repository maintenance": Go to "Danger zone" and click on "Reset".
11. Weblate "Repository maintenance": "Unlock" the project.

# Introducing the localization process in the Back In Time project

Expand All @@ -54,7 +54,7 @@ GitHub.
1. Scan all python files (in `common` and `qt` excluding `test_*.py`) for translatable strings and store them into the _message template file_ `common/po/message.pot`.
2. Synchronize that _message template file_ with the existing translations (`common/po/*.po`).
3. Commit and push the modifications into the development branch (e.g. `dev`).
4. The Weblate plattform do pull that changes from our upstream repository into its own internal repository (manual triggerd by maintainers or automatically).
4. The Weblate platform do pull that changes from our upstream repository into its own internal repository (manual triggered by maintainers or automatically).
5. Now the contributors can translate using our [Weblate "Back In Time" project](https://translate.codeberg.org/projects/backintime/). There is also a [translation landing page](https://translate.codeberg.org/engage/backintime).
6. The translations on Weblate (as `po` files) need to be committed (manual or automatically) into the Weblate repository.
7. The `po` files with fresh translations are downloaded (via `git clone`) from the Weblate repository and copied into the BIT upstream repository.
Expand Down Expand Up @@ -127,7 +127,7 @@ index 68dc7795..b6e07b50 100644
msgstr "Deaktiviert"
```

In the end those changes need to arrive in the `dev` branch to get recognized by the Weblate translation plattform. Create a Pull Request or commit/merge and push.
In the end those changes need to arrive in the `dev` branch to get recognized by the Weblate translation platform. Create a Pull Request or commit/merge and push.

If the project at Weblate is correctly setup it does recognize the new commit automatically and update its internal git repository. See this in _Manage_ / _Repository maintenance_ section:

Expand All @@ -147,7 +147,7 @@ Go to the next section to see how to integrate the translation back to the upstr

The starting situation is that some strings are translated by contributors on the Weblate platform. Go to _Manage_ / _Repository maintenance_ section. The counter for _Pending changes not yet committed to the Weblate repository_ should be 1 or more. Click on _Commit_ that counter goes back to 0 but now the _Outgoing commits in the Weblate repository_ are increased. There is also a difference between the _Last remote commit_ and _Last commit in Weblate_:

![Download from Weblate: Commited translation](2_from_weblate_01.png)
![Download from Weblate: Committed translation](2_from_weblate_01.png)

Go back to your local repository and run the known `update_language_files.py` script with `weblate` as argument:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ Finally run the unit tests again to make sure the firewall is working correctly
Just kill the sshd process (works until you restart your computer):

```commandline
# Find the process nubmer of the sshd daemon
# Find the process number of the sshd daemon
$ ps aux | grep -i sshd
root 202345 0.0 0.0 12184 7076 ? Ss 23:25 0:00 sshd: /usr/sbin/sshd -D [listener] 0 of 10-100 startups

Expand Down
2 changes: 1 addition & 1 deletion common/mount.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
The high-level mount API is :py:class:`Mount` and handles mount,
umount, remount and checks for *Back In Time*. The low-level mount API
is :py:class:`MountControl`. The latter can be used to create own
mounting serivces via subclassing it. See the following example.
mounting services via subclassing it. See the following example.

Example:

Expand Down
2 changes: 1 addition & 1 deletion common/qt5_probing.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# non-python low-level signal sent via C/C++.
#
# Even though the coredump message cannot be prevent there is
# workaround to prevent the cordump **file** creation which
# workaround to prevent the coredump **file** creation which
# would take too much time just to probe Qt5's availability:
#
# Use resource.setrlimit() to set resource.RLIMIT_CORE’s soft limit to 0
Expand Down
Loading