Skip to content

Commit

Permalink
Merge branch 'merge-221118' into my
Browse files Browse the repository at this point in the history
* merge-221118: (66 commits)
  Frontend: Update deps in package-lock.json
  Frontend: Update translations.json
  UI: Add Electra theme photoprism#2916
  MariaDB: Make version check compatible with 10.10 photoprism#2913
  Weblate: Update backend translations
  Weblate: Update frontend translations
  Backend: Upgrade golang.org/x/crypto in go.mod and go.sum
  Develop: Upgrade base image from 221116-jammy to 221117-jammy
  CI: Update "docker-develop-latest" target in Makefile
  CI: Update deploy-develop.sh script
  MariaDB: Upgrade pre-installed client from v10.6 to v10.9
  Videos: Add "intel" init target to force driver installation photoprism#2700
  Metadata: Improve data parsing and sanitization photoprism#2897
  Frontend: Update translations.json and package-lock.json
  Weblate: Update frontend translations
  Develop: Upgrade base image from 221102-jammy to 221116-jammy
  Frontend: Update translations.json
  Frontend: update options.js
  Weblate: Update frontend translations
  Weblate: Update backend translations
  ...
  • Loading branch information
jionghangcai committed Nov 28, 2022
2 parents cc08390 + e58fee0 commit 29b1a33
Show file tree
Hide file tree
Showing 95 changed files with 3,597 additions and 42,167 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Ubuntu 22.04 LTS (Jammy Jellyfish)
FROM photoprism/develop:221102-jammy
FROM photoprism/develop:221117-jammy

## Alternative Environments:
# FROM photoprism/develop:bookworm # Debian 12 (Bookworm)
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ test-coverage:
$(info Running all Go tests with code coverage report...)
go test -parallel 1 -count 1 -cpu 1 -failfast -tags slow -timeout 30m -coverprofile coverage.txt -covermode atomic ./pkg/... ./internal/...
go tool cover -html=coverage.txt -o coverage.html
go tool cover -func coverage.txt | grep total:
docker-pull:
docker compose pull --ignore-pull-failures
docker compose -f docker-compose.latest.yml pull --ignore-pull-failures
Expand All @@ -293,7 +294,7 @@ docker-build:
docker compose build
docker-develop: docker-develop-latest
docker-develop-all: docker-develop-latest docker-develop-other
docker-develop-latest: docker-develop-ubuntu docker-develop-armv7
docker-develop-latest: docker-develop-ubuntu
docker-develop-debian: docker-develop-bookworm docker-develop-bookworm-slim
docker-develop-ubuntu: docker-develop-jammy docker-develop-jammy-slim
docker-develop-other: docker-develop-debian docker-develop-bullseye docker-develop-bullseye-slim docker-develop-buster
Expand Down
10 changes: 5 additions & 5 deletions assets/locales/cs/default.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: ci@photoprism.app\n"
"POT-Creation-Date: 2022-10-31 12:20+0000\n"
"PO-Revision-Date: 2022-11-01 13:32+0100\n"
"Last-Translator: Michael Mayer <michael@photoprism.org>\n"
"PO-Revision-Date: 2022-11-18 11:30+0000\n"
"Last-Translator: Roman Janiczek <roman@janiczek.cz>\n"
"Language-Team: Czech <https://translate.photoprism.app/projects/photoprism/"
"backend/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Poedit 3.2\n"
"X-Generator: Weblate 4.14.2\n"

#: messages.go:94
msgid "Unexpected error, please try again"
Expand Down Expand Up @@ -187,7 +187,7 @@ msgstr "Váš účet se nepodařilo připojit"

#: messages.go:137
msgid "Changes successfully saved"
msgstr "Změny úspěšně uloženy"
msgstr "Změny byly úspěšně uloženy"

#: messages.go:138
msgid "Album created"
Expand Down
Loading

0 comments on commit 29b1a33

Please sign in to comment.