Skip to content

Commit

Permalink
Merge branch 'teslamate-org:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
micves authored Feb 28, 2024
2 parents 7058091 + 7ff3fd1 commit edbda50
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ runs:
- name: Upload digest
uses: actions/upload-artifact@v4
with:
name: digests
name: single-digest-${{ matrix.runs-on }}
path: /tmp/digests/*
if-no-files-found: error
retention-days: 1
4 changes: 3 additions & 1 deletion .github/actions/merge/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ runs:
using: "composite"
steps:
- name: Download digests
uses: actions/download-artifact@v3
uses: actions/upload-artifact/merge@v4
with:
name: digests
pattern: single-digest-*
path: /tmp/digests
merge-multiple: true

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- feat: Add stat panel for selected duration in drive details dashboard (#3667 - @oivindoh)
- ci: run edge build every night ([206d731](https://github.com/teslamate-org/teslamate/commit/206d731935a5e8ebc350a7981df8c6d92480b88b) - @JakobLichterfeld)
- ci: update upload-artifact action (#3689 - @JakobLichterfeld)
- fix: upload and merge artifact naming conflict since action version v4 (#3689 - @JakobLichterfeld)
- build: bump app base image to fix 'GLIBC_2.34' not found error (#3691- @JakobLichterfeld)
- build: bump app dependencies for libssl and netcat to packages available in debian bookworm (#3691- @JakobLichterfeld)
- build: reduce the size of the Docker image by cleaning the APT cache (#3692- @JakobLichterfeld)
Expand All @@ -27,6 +28,8 @@
- Add Thai Translation (#3566 - @tomzt)
- Update default.po missing french translations (#3662 - @pquattro)
- update zh_Hans text (#3664 - @mrgaolei)
- Add missing German translation for new messages, fix mistakes (#3694 - @accolon)
- feat: add missing translation for new messages for Korean (#3693 - @zipizigi)

#### Documentation

Expand Down
12 changes: 6 additions & 6 deletions priv/gettext/de/LC_MESSAGES/default.po
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ msgstr "Türen geöffnet"
#: lib/teslamate_web/live/car_live/summary.ex:136
#, elixir-autogen, elixir-format
msgid "Trunk is open"
msgstr "Kofferraum is geöffnet"
msgstr "Kofferraum ist geöffnet"

#: lib/teslamate_web/live/charge_live/cost.html.heex:141
#: lib/teslamate_web/live/geofence_live/form.html.heex:73
Expand Down Expand Up @@ -603,7 +603,7 @@ msgstr "hier"
#: lib/teslamate_web/live/signin_live/index.ex:59
#, elixir-autogen, elixir-format
msgid "Your Tesla account is locked due to too many failed sign in attempts. To unlock your account, reset your password"
msgstr "Ihr Tesla-Konto ist aufgrund von zu vielen fehlgeschlagenen Anmeldeversuchen gesperrt. Um Ihr Konto zu entsperren, setzen Sie Ihr Kennwort zurück"
msgstr "Dein Tesla-Konto ist aufgrund von zu vielen fehlgeschlagenen Anmeldeversuchen gesperrt. Um das Konto zu entsperren, setze dein Kennwort zurück"

#: lib/teslamate_web/live/car_live/summary.ex:141
#, elixir-autogen, elixir-format
Expand Down Expand Up @@ -638,19 +638,19 @@ msgstr "Reifendruck"
#: lib/teslamate_web/live/car_live/summary.html.heex:145
#, elixir-autogen, elixir-format
msgid "Low tire pressure, check (%{tire_low}) tire"
msgstr ""
msgstr "Niedriger Reifendruck, Reifen (%{tire_low}) prüfen"

#: lib/teslamate_web/live/car_live/summary.html.heex:65
#, elixir-autogen, elixir-format
msgid "Dog Mode"
msgstr ""
msgstr "Hundemodus"

#: lib/teslamate_web/live/car_live/summary.ex:139
#, elixir-autogen, elixir-format
msgid "Dog mode is enabled"
msgstr ""
msgstr "Hundemodus ist aktiviert"

#: lib/teslamate_web/live/car_live/summary.html.heex:232
#, elixir-autogen, elixir-format
msgid "Expected Finish Time"
msgstr ""
msgstr "Erwartete Endzeit"
8 changes: 4 additions & 4 deletions priv/gettext/ko/LC_MESSAGES/default.po
Original file line number Diff line number Diff line change
Expand Up @@ -638,19 +638,19 @@ msgstr "공기압"
#: lib/teslamate_web/live/car_live/summary.html.heex:145
#, elixir-autogen, elixir-format
msgid "Low tire pressure, check (%{tire_low}) tire"
msgstr ""
msgstr "타이어 공기압 부족, 타이어(%{tire_low})를 확인하세요."

#: lib/teslamate_web/live/car_live/summary.html.heex:65
#, elixir-autogen, elixir-format
msgid "Dog Mode"
msgstr ""
msgstr "애견 모드"

#: lib/teslamate_web/live/car_live/summary.ex:139
#, elixir-autogen, elixir-format
msgid "Dog mode is enabled"
msgstr ""
msgstr "애견 모드가 켜져있습니다."

#: lib/teslamate_web/live/car_live/summary.html.heex:232
#, elixir-autogen, elixir-format
msgid "Expected Finish Time"
msgstr ""
msgstr "예상 종료 시간"

0 comments on commit edbda50

Please sign in to comment.