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

Release v2.2.3 #674

Merged
merged 58 commits into from
Dec 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
4fc7f44
Update README.md
archisman-panigrahi Aug 6, 2024
b811ecf
Update README.md
archisman-panigrahi Aug 6, 2024
3a8e5b0
Document validate_po.py script in readme and github PR template
deltragon Aug 7, 2024
2b634e8
Merge pull request #626 from deltragon/document-validate-po
archisman-panigrahi Aug 7, 2024
d4ca93c
Translated using Weblate (English (United States))
archisman-panigrahi Aug 6, 2024
b35c792
Merge branch 'origin/master' into Weblate.
weblate Aug 7, 2024
63cb5be
add translation link
archisman-panigrahi Aug 10, 2024
e50a4b5
request translations
archisman-panigrahi Aug 10, 2024
5280755
Merge branch 'master' of https://github.com/archisman-panigrahi/SafeEyes
archisman-panigrahi Aug 10, 2024
b15d47b
Translated using Weblate (German)
archisman-panigrahi Aug 10, 2024
76bddbb
gentoo has safeeyes as official package
archisman-panigrahi Aug 11, 2024
8213208
initiate bangla tranlations
archisman-panigrahi Aug 11, 2024
c485604
Merge pull request #633 from archisman-panigrahi/bangla-translation
archisman-panigrahi Aug 11, 2024
de8fc94
add how to translate link to readme
archisman-panigrahi Aug 11, 2024
39265b7
Use readme link instead
archisman-panigrahi Aug 11, 2024
1d3f804
Make config and stylesheet files non-executable
terop Aug 12, 2024
9a8891d
Merge pull request #634 from terop/non_executable_config
deltragon Aug 12, 2024
c1caa98
Translated using Weblate (Spanish)
gallegonovato Aug 16, 2024
20a53a0
Translated using Weblate (Bengali)
archisman-panigrahi Aug 15, 2024
d92b9b3
Merge pull request #630 from archisman-panigrahi/master
archisman-panigrahi Aug 19, 2024
f9dcb56
PluginManager: refactor to better keep errored plugins around
deltragon Aug 20, 2024
6edb343
PluginManager: retry loading trayicon plugin when service is missing
deltragon Aug 21, 2024
d16147c
Translated using Weblate (French)
AO-LocLab Aug 23, 2024
959177e
Merge branch 'origin/master' into Weblate.
weblate Aug 24, 2024
c934d30
Translated using Weblate (Italian)
albanobattistella Aug 27, 2024
24db938
Translated using Weblate (Czech)
vikdevelop Aug 26, 2024
d93aabf
Update bug_report.md
archisman-panigrahi Aug 31, 2024
411c538
add flatpak warning
archisman-panigrahi Aug 31, 2024
f393437
Translated using Weblate (Spanish)
gallegonovato Sep 1, 2024
b45e59c
Translated using Weblate (Turkish)
oersen Sep 1, 2024
e00fc97
Merge branch 'origin/master' into Weblate.
weblate Sep 2, 2024
0b80f50
Translated using Weblate (Russian)
AircGroup Sep 5, 2024
f25f554
trayicon: set XAyatanaLabel attribute for "Show next break time in tr…
deltragon Sep 12, 2024
982c6c8
Translated using Weblate (Arabic)
Sep 16, 2024
033c56c
Update plugin.py to capture time_in_minutes
aceArt-GmbH Sep 18, 2024
6186c4d
Translated using Weblate (Persian)
danialbehzadi Sep 19, 2024
7986e09
Translated using Weblate (German)
ErikMichelson Sep 20, 2024
1a70cb6
Merge pull request #650 from aceArt-GmbH/patch-1
archisman-panigrahi Sep 22, 2024
641eeda
Merge pull request #638 from deltragon/trayicon-retry
archisman-panigrahi Sep 22, 2024
628abe2
Merge pull request #646 from deltragon/xayatanalabel
archisman-panigrahi Sep 23, 2024
0fa7b35
Translated using Weblate (Catalan)
sitoxplex Sep 26, 2024
47be152
Merge branch 'origin/master' into Weblate.
weblate Sep 27, 2024
5761f0f
Translated using Weblate (Lithuanian)
welaq Oct 10, 2024
0fdb432
Replace "|" into "or" for Python 3.6 compatibility
embar- Oct 13, 2024
a52eb0a
Use Optional and Union instead of "|" for Python 3.6 compatibility
embar- Oct 13, 2024
a3ca7b7
Translated using Weblate (Lithuanian)
embar- Oct 13, 2024
32f1343
Fix "|" usage for dict for older Python compatibility
embar- Oct 17, 2024
6da10e6
Merge pull request #657 from embar-/patch-1
archisman-panigrahi Oct 17, 2024
ae0a2ff
Translated using Weblate (Slovak)
Nov 1, 2024
7d73b18
Merge branch 'origin/master' into Weblate.
weblate Nov 2, 2024
dfe7270
Translated using Weblate (Hebrew)
yarons Nov 10, 2024
ff79402
Translated using Weblate (Estonian)
Nov 12, 2024
b0b6247
Translated using Weblate (French)
AO-LocLab Nov 11, 2024
190b25b
Add 'hyprland' to the list of recognized desktop sessions
pol-rivero Dec 11, 2024
9927bfe
Merge pull request #669 from pol-rivero/master
deltragon Dec 15, 2024
2e63463
Remove dependency on X11 (#672)
m00nwtchr Dec 18, 2024
843c7c3
translations
deltragon Dec 25, 2024
b924521
v2.2.3
deltragon Dec 25, 2024
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
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ A clear and concise description of what you expected to happen.
- Desktop Env [e.g. Gnome, KDE]
- Version [e.g. 2.0.3]

**Flatpak issues**: If you experience any issue with flatpak, first please ensure that the bug is present in the [native package](https://github.com/slgobinath/SafeEyes?tab=readme-ov-file#installation-guide), and it is not a flatpak-only bug. Flatpak-only bugs should be reported at https://github.com/flathub/io.github.slgobinath.SafeEyes. (**Please erase this paragraph before creating the bug report**)

**Debug Log**
Run the Safe Eyes using `safeeyes --debug` command attach the ~/safeeyes.log` file.

Expand Down
5 changes: 5 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## Description

Describe your changes here, and link to related issues if available.

Reminder to run `python validate_po.py --extract` if you have added new translatable strings.
26 changes: 21 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Safe Eyes is available on the official repositories of many popular the distribu
<img src="https://repology.org/badge/vertical-allrepos/safeeyes.svg" alt="Packaging status" align="right">
</a>

It is also available in Ubuntu PPA, Arch AUR, Gentoo and Python PyPI. You can choose any installation source and install on any Linux system with Python 3.
It is also available in Ubuntu PPA, Arch AUR and Python PyPI. You can choose any installation source and install on any Linux system with Python 3.


### Ubuntu, Linux Mint and other Ubuntu Derivatives
Expand Down Expand Up @@ -79,13 +79,15 @@ sudo apt-get install safeeyes
```

### Fedora

If you want to use Smart Pause plugin, install the latest xprintidle from: [alonid/xprintidle](https://copr.fedorainfracloud.org/coprs/alonid/xprintidle/)
```bash
sudo dnf install python3-psutil python3-packaging cairo-devel python3-devel gobject-introspection-devel cairo-gobject-devel
sudo pip3 install safeeyes
sudo gtk-update-icon-cache /usr/share/icons/hicolor
```

We are looking for an official package maintainer for Fedora. Please [contact us](https://github.com/slgobinath/SafeEyes/issues/611) if you are interested.

### OpenSUSE Tumbleweed

```bash
Expand All @@ -100,7 +102,7 @@ sudo apk add safeeyes
```

### Flatpak

**Warning**: Many plugins and features don't work well in the flatpak. We recommend that you use one of the native packages listed above. Flatpak-only bugs should be reported at https://github.com/flathub/io.github.slgobinath.SafeEyes.
```bash
flatpak install flathub io.github.slgobinath.SafeEyes
```
Expand Down Expand Up @@ -184,14 +186,22 @@ For more details, please check the issue: [#329](https://github.com/slgobinath/S

Thirdparty plugins are available at another GitHub repository: [safeeyes-plugins](https://github.com/slgobinath/safeeyes-plugins). More details about how to write your own plugin and how to install third-party plugin are available there.

## Local development

When adding new translatable strings in the source code, make sure to run `python validate_po.py --extract` to add them to the translation template. You will need to install `python3-polib` for this.

Examples for translatable strings are `_("This is a string")` in Python code, or `<property name="label" translatable="yes">This is a label</property>` in Glade/xml files.

To ensure the new strings are well-formed, you can use `python validate_po.py --validate`.

## How to Release?

0. Run `update-po.sh` to generate new translation files (which will be eventually updated by translators). Commit and push the changes to the master branch.
1. Checkout the latest commits from the `master` branch
2. Run `python3 -m safeeyes` to make sure nothing is broken
3. Update the Safe Eyes version in the following places (Open the project in VSCode and search for the current version):
- [setup.py](https://github.com/slgobinath/SafeEyes/blob/master/setup.py#L83)
- [setup.py](https://github.com/slgobinath/SafeEyes/blob/master/setup.py#L90)
- [setup.py](https://github.com/slgobinath/SafeEyes/blob/master/setup.py#L82)
- [setup.py](https://github.com/slgobinath/SafeEyes/blob/master/setup.py#L89)
- [safeeyes.py](https://github.com/slgobinath/SafeEyes/blob/master/safeeyes/safeeyes.py#L42)
- [io.github.slgobinath.SafeEyes.metainfo.xml](https://github.com/slgobinath/SafeEyes/blob/master/safeeyes/platform/io.github.slgobinath.SafeEyes.metainfo.xml#L56)
- [about_dialog.glade](https://github.com/slgobinath/SafeEyes/blob/master/safeeyes/glade/about_dialog.glade#L74)
Expand All @@ -200,6 +210,12 @@ Thirdparty plugins are available at another GitHub repository: [safeeyes-plugins
6. Create a pull-request from `master` to `release`
7. Merge the PR to release **with merge commit** (Important to merge with merge commit)

## How you can help improving translation of Safe Eyes

First check if translations for your language are already available on [Weblate](https://hosted.weblate.org/engage/safe-eyes/), which is the cloud based translation platform we use.

- If the language is already there, feel free to add new translations or improve the existing ones.
- If it is not there, please [open an issue](https://github.com/slgobinath/SafeEyes/issues) in Github so that we can add your language to Weblate.

## License

Expand Down
21 changes: 21 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
safeeyes (2.2.3) jammy; urgency=medium

* Translations

* Make config and stylesheet files non-executable

* Retry loading trayicon plugin to fix races on startup

* Fix "Show next break time in tray icon" for desktops support tray icons
with labels

* Fix next break time in tray icon when disabling SafeEyes

* Make SafeEyes compatible with Python 3.6 again

* Add 'hyprland' to the list of recognized desktop sessions

* Remove hard dependency on X11

-- Mel Dafert <[email protected]> Wed, 25 Dec 2024 11:46:00 +0000

safeeyes (2.2.2) jammy; urgency=medium

* Fixed translations
Expand Down
34 changes: 19 additions & 15 deletions safeeyes/config/locale/ar/LC_MESSAGES/safeeyes.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2024-07-26 11:09+0000\n"
"Last-Translator: RDWN IT <raraja701@gmail.com>\n"
"PO-Revision-Date: 2024-09-17 01:09+0000\n"
"Last-Translator: Barman Anonymous Please <barman-object-knee@duck.com>\n"
"Language-Team: Arabic <https://hosted.weblate.org/projects/safe-eyes/"
"translations/ar/>\n"
"Language: ar\n"
Expand All @@ -16,11 +16,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"X-Generator: Weblate 5.7-dev\n"
"X-Generator: Weblate 5.8-dev\n"

# Short break
msgid "Gently close your eyes"
msgstr ""
msgstr "أغمض عينيك بلطف"

# Short break
msgid "Roll your eyes a few times to each side"
Expand All @@ -40,7 +40,7 @@ msgstr "اغمز بعينيك"

# Short break
msgid "Focus on a point in the far distance"
msgstr "ركّز على نقطة في المدى البعيد"
msgstr "ركّز على نقطة بعيدة"

# Short break
msgid "Have some water"
Expand Down Expand Up @@ -76,7 +76,7 @@ msgstr "إظهار لوحة اﻹعدادات"

# Commandline arg description
msgid "start safeeyes in debug mode"
msgstr "ابدأ عيون سليمة في وضع التنقيح"
msgstr "ابدأ safeeyes في وضع التنقيح (debug)"

# Commandline arg description
msgid "print the status of running safeeyes instance and exit"
Expand Down Expand Up @@ -109,7 +109,11 @@ msgstr "الرخصة"

# About dialog
msgid "List of Contributors"
msgstr ""
msgstr "قائمة المساهمين"

# About dialog
msgid "Help us translate this app"
msgstr "ساعدنا في ترجمة هذا التطبيق"

# Break screen
msgid "Skip"
Expand Down Expand Up @@ -535,36 +539,36 @@ msgstr "أوقِف الوسائط"

# plugin/limitconsecutiveskipping
msgid "Limit Consecutive Skipping"
msgstr ""
msgstr "تقييد التخطي المتتالي"

# plugin/limitconsecutiveskipping
msgid "How many skips or postpones are allowed in a row"
msgstr ""
msgstr "عدد مرات التخطي أو التأجيل المسموح بها على التوالي"

# plugin/limitconsecutiveskipping
msgid "Limit how many breaks can be skipped or postponed in a row"
msgstr ""
msgstr "حدد عدد فترات الاستراحة التي يمكن تخطيها أو تأجيلها على التوالي"

# plugin/limitconsecutiveskipping
#, python-format
msgid "Skipped or postponed %(num)d/%(allowed)d breaks in a row"
msgstr ""
msgstr "تم تخطي أو تأجيل %(num)d/%(allowed)d من فترات الاستراحة على التوالي"

# safeeyes/platform/io.github.slgobinath.SafeEyes.desktop
msgid "RSI Prevention"
msgstr ""
msgstr "الوقاية من الإصابات الناتجة عن الإجهاد المتكرر للعينين"

msgid ""
"Please install service providing tray icons for your desktop environment."
msgstr ""
msgstr "يرجى تثبيت خدمة توفر أيقونات في علبة النظام لبيئة سطح المكتب الخاصة بك."

#, python-format
msgid "Next long break at %s"
msgstr ""
msgstr "الاستراحة الطويلة القادمة في %s"

#, python-format
msgid "Next breaks at %(short)s/%(long)s"
msgstr ""
msgstr "الاستراحة القادمة في %(short)s/%(long)s"

#, python-format
msgid "The required plugin '%s' is missing dependencies!"
Expand Down
4 changes: 4 additions & 0 deletions safeeyes/config/locale/bg/LC_MESSAGES/safeeyes.po
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ msgstr "Лиценз"
msgid "List of Contributors"
msgstr ""

# About dialog
msgid "Help us translate this app"
msgstr ""

# Break screen
msgid "Skip"
msgstr "Пропускане"
Expand Down
Loading
Loading