Skip to content

Commit

Permalink
Merge branch 'develop' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
FrancescoCeruti committed Feb 28, 2024
2 parents c51011d + 88f17c9 commit 67fbd5d
Show file tree
Hide file tree
Showing 32 changed files with 382 additions and 425 deletions.
6 changes: 5 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ version: 2.1
jobs:
build-flatpak:
machine:
image: ubuntu-2204:2023.07.2
image: ubuntu-2204:2023.10.1

resource_class: large

working_directory: ~/repo

Expand All @@ -12,6 +14,8 @@ jobs:

steps:
- checkout
- run: git submodule sync
- run: git submodule update --init

- run:
name: SYSTEM ⟹ Install required packages
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "scripts/flatpak/shared-submodules"]
path = scripts/flatpak/shared-modules
url = https://github.com/flathub/shared-modules.git
3 changes: 3 additions & 0 deletions docs/user/cues/misc_cues.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ Be sure to understand what you're doing, and avoid dangerous and untrested comma
* **Discard command output:** when enabled the command output is discarded
* **Ignore command errors:** when enabled errors are not reported
* **Kill instead of terminate:** when enabled, on stop, the command is killed (abruptly interrupted by the OS)
* **Run the command on the host system (_Available only for flatpak installations._):**
When disabled the command will be run inside the sandbox, this will prevent access to any application
installed on your "host" system

### Examples

Expand Down
4 changes: 2 additions & 2 deletions docs/user/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Here some functionality offered by LiSP:

Currently, only GNU/Linux systems are supported.

The application is quite stable, is already been used for multiple performances
The application is quite stable, it's already been used for multiple performances
by different people, but, due to the heterogeneous nature of the GNU/Linux ecosystem,
my suggestion is to test it in a "production" environment to detect possible problems
with some configuration.
with some configurations.
6 changes: 4 additions & 2 deletions docs/user/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ follow their _simple_ instructions, <a href="https://flatpak.org/setup/" target=
### Download LiSP

You can get the latest builds here:

* [Flathub](https://flathub.org/apps/org.linuxshowplayer.LinuxShowPlayer) - Official release
* [Master](https://github.com/FrancescoCeruti/linux-show-player/releases/tag/ci-master) - Generally stable
* [Development](https://github.com/FrancescoCeruti/linux-show-player/releases/tag/ci-develop) - Preview features, might be unstable and untested

### Install
### Install (master/development)

If you have the right app installed it might be possible to simply double-click the downloaded file, otherwise, you
can use the following command:
Expand Down Expand Up @@ -64,7 +66,7 @@ With the following instructions you will:
3. Run LiSP in that venv via poetry

```{important}
What follows are guidelines to run LiSP without a "proper" installation, **if something is missing or doens't work let us know!**
What follows are guidelines to run LiSP without a "proper" installation, **if something is missing or doesn't work let us know!**
```

### Dependencies (1/2)
Expand Down
3 changes: 3 additions & 0 deletions lisp/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Linux Show Player. If not, see <http://www.gnu.org/licenses/>.

import os
from os import path

from appdirs import AppDirs
Expand Down Expand Up @@ -46,3 +47,5 @@

ICON_THEMES_DIR = path.join(APP_DIR, "ui", "icons")
ICON_THEME_COMMON = "lisp"

RUNNING_IN_FLATPAK = "FLATPAK_ID" in os.environ
Binary file modified lisp/i18n/qm/base_de_DE.qm
Binary file not shown.
8 changes: 4 additions & 4 deletions lisp/i18n/ts/de_DE/action_cues.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<message>
<location filename="../../../plugins/action_cues/command_cue.py" line="80"/>
<source>Command cue ended with an error status. Exit code: {}</source>
<translation type="unfinished">Command cue ended with an error status. Exit code: {}</translation>
<translation>Befehls-Cue endete mit einem Fehlerstatus. Exit-Code: {}</translation>
</message>
</context>
<context>
Expand All @@ -70,7 +70,7 @@
<message>
<location filename="../../../plugins/action_cues/seek_cue.py" line="40"/>
<source>Seek Cue</source>
<translation>Positions-Cue</translation>
<translation>Seek-Cue</translation>
</message>
<message>
<location filename="../../../plugins/action_cues/collection_cue.py" line="43"/>
Expand Down Expand Up @@ -156,15 +156,15 @@
<message>
<location filename="../../../plugins/action_cues/seek_cue.py" line="103"/>
<source>Time to reach</source>
<translation>Zeit zum Erreichen</translation>
<translation>Zu erreichende Zeit</translation>
</message>
</context>
<context>
<name>SettingsPageName</name>
<message>
<location filename="../../../plugins/action_cues/seek_cue.py" line="59"/>
<source>Seek Settings</source>
<translation>Sucheinstellungen</translation>
<translation>Seek Einstellungen</translation>
</message>
<message>
<location filename="../../../plugins/action_cues/collection_cue.py" line="108"/>
Expand Down
14 changes: 7 additions & 7 deletions lisp/i18n/ts/de_DE/controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<message>
<location filename="../../../plugins/controller/controller.py" line="166"/>
<source>Cannot load controller protocol: "{}"</source>
<translation type="unfinished">Cannot load controller protocol: "{}"</translation>
<translation>Kann das Controller-Protokoll nicht laden: "{}"</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -85,7 +85,7 @@
<message>
<location filename="../../../plugins/controller/protocols/midi.py" line="147"/>
<source>Error while importing configuration entry, skipped.</source>
<translation type="unfinished">Error while importing configuration entry, skipped.</translation>
<translation>Fehler beim Importieren des Konfigurationseintrags, übersprungen.</translation>
</message>
</context>
<context>
Expand All @@ -98,12 +98,12 @@
<message>
<location filename="../../../plugins/controller/protocols/osc.py" line="104"/>
<source>OSC Path:</source>
<translation type="unfinished">OSC Path:</translation>
<translation>OSC-Pfad:</translation>
</message>
<message>
<location filename="../../../plugins/controller/protocols/osc.py" line="110"/>
<source>/path/to/method</source>
<translation>/pfad/zu/methode</translation>
<translation>/pfad/zur/methode</translation>
</message>
<message>
<location filename="../../../plugins/controller/protocols/osc.py" line="238"/>
Expand Down Expand Up @@ -167,13 +167,13 @@
<location filename="../../../plugins/controller/protocols/osc.py" line="358"/>
<source>Osc path seems invalid,
do not forget to edit the path later.</source>
<translation type="unfinished">Osc path seems invalid,
do not forget to edit the path later.</translation>
<translation>OSC-Pfad scheint ungültig,
vergessen Sie nicht, den Pfad später zu überarbeiten.</translation>
</message>
<message>
<location filename="../../../plugins/controller/protocols/osc.py" line="317"/>
<source>Error while importing configuration entry, skipped.</source>
<translation type="unfinished">Error while importing configuration entry, skipped.</translation>
<translation>Fehler beim Importieren des Konfigurationseintrags, übersprungen.</translation>
</message>
</context>
<context>
Expand Down
10 changes: 5 additions & 5 deletions lisp/i18n/ts/de_DE/gst_backend.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<message>
<location filename="../../../plugins/gst_backend/settings/alsa_sink.py" line="65"/>
<source>To make your custom PCM objects appear correctly in this list requires adding a 'hint.description' line to them.</source>
<translation type="unfinished">To make your custom PCM objects appear correctly in this list requires adding a 'hint.description' line to them.</translation>
<translation>Um Ihre eigenen PCM-Objekte korrekt in dieser Liste erscheinen zu lassen, muss eine 'hint.description' Zeile hinzugefügt werden.</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -142,7 +142,7 @@
<message>
<location filename="../../../plugins/gst_backend/gst_media.py" line="242"/>
<source>Cannot create pipeline element: "{}"</source>
<translation type="unfinished">Cannot create pipeline element: "{}"</translation>
<translation>Pipeline-Element kann nicht erstellt werden: "{}"</translation>
</message>
</context>
<context>
Expand All @@ -158,7 +158,7 @@
<message>
<location filename="../../../plugins/gst_backend/gst_media.py" line="236"/>
<source>Invalid pipeline element: "{}"</source>
<translation type="unfinished">Invalid pipeline element: "{}"</translation>
<translation>Ungültiges Pipeline-Element: "{}"</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -187,7 +187,7 @@
<message>
<location filename="../../../plugins/gst_backend/elements/jack_sink.py" line="136"/>
<source>An error occurred while disconnecting Jack ports</source>
<translation type="unfinished">An error occurred while disconnecting Jack ports</translation>
<translation>Fehler beim Trennen der Jack-Ports</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -337,7 +337,7 @@
<message>
<location filename="../../../plugins/gst_backend/config/alsa_sink.py" line="25"/>
<source>ALSA Default Device</source>
<translation type="unfinished">ALSA Default Device</translation>
<translation>ALSA Standardgerät</translation>
</message>
</context>
<context>
Expand Down
Loading

0 comments on commit 67fbd5d

Please sign in to comment.