From 02bcd74ac3b69e12bc4239b3869e508d1cb1e43e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Sch=C3=BCller?= Date: Sun, 31 Jan 2021 23:35:16 +0100 Subject: [PATCH] feat(lang): Finnish Added --- .gitlab-ci.yml | 128 +++++++++++++----- .releaserc.yml | 25 ++++ README.md | 2 + VERSION.txt | 1 + app/build.gradle | 6 +- app/src/main/res/values-de/strings.xml | 8 ++ app/src/main/res/values-fi/strings.xml | 57 +++++++- app/src/main/res/values-pt-rBR/strings.xml | 4 +- .../android/de-DE/changelogs/1050.txt | 2 + .../android/de-DE/changelogs/1051.txt | 5 + .../android/de-DE/changelogs/1052.txt | 2 + .../android/fi-FI/changelogs/1047.txt | 1 + .../android/fi-FI/changelogs/1050.txt | 2 + .../android/fi-FI/changelogs/1052.txt | 2 + .../android/fi-FI/full_description.txt | 1 + .../android/fi-FI/short_description.txt | 1 + fastlane/metadata/android/fi-FI/title.txt | 1 + fastlane/metadata/android/fi-FI/video.txt | 1 + .../android/ru-RU/changelogs/1050.txt | 2 + .../android/ru-RU/changelogs/1051.txt | 5 + .../android/ru-RU/changelogs/1052.txt | 2 + 21 files changed, 218 insertions(+), 40 deletions(-) create mode 100644 .releaserc.yml create mode 100644 VERSION.txt create mode 100644 fastlane/metadata/android/de-DE/changelogs/1050.txt create mode 100644 fastlane/metadata/android/de-DE/changelogs/1051.txt create mode 100644 fastlane/metadata/android/de-DE/changelogs/1052.txt create mode 100644 fastlane/metadata/android/fi-FI/changelogs/1047.txt create mode 100644 fastlane/metadata/android/fi-FI/changelogs/1050.txt create mode 100644 fastlane/metadata/android/fi-FI/changelogs/1052.txt create mode 100644 fastlane/metadata/android/fi-FI/full_description.txt create mode 100644 fastlane/metadata/android/fi-FI/short_description.txt create mode 100644 fastlane/metadata/android/fi-FI/title.txt create mode 100644 fastlane/metadata/android/fi-FI/video.txt create mode 100644 fastlane/metadata/android/ru-RU/changelogs/1050.txt create mode 100644 fastlane/metadata/android/ru-RU/changelogs/1051.txt create mode 100644 fastlane/metadata/android/ru-RU/changelogs/1052.txt diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8af2caf..5d11a0a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,13 @@ stages: - environment + - fetch-version - build - test + - release - internal - alpha - beta - production - - stop .updateContainerJob: image: docker:stable @@ -46,17 +47,59 @@ ensureContainer: - pwd - echo "$signing_jks_file_hex" | xxd -r -p - > android-signing-keystore.jks - md5sum android-signing-keystore.jks - # get next version from latest changelog - - "export VERSION_CODE=`ls -f ./fastlane/metadata/android/en-US/changelogs | cut -d_ -f3 | sort -n | tail -1 | rev | cut -c5- | rev` && echo $VERSION_CODE" - # We add 200 to get this high enough above current versionCodes that are published - # - "export VERSION_CODE=$((200 + $CI_PIPELINE_IID)) && echo $VERSION_CODE" - - "export VERSION_SHA=`echo ${CI_COMMIT_SHA:0:8}` && echo $VERSION_SHA" - - "export VERSION_NAME=${VERSION_CODE:0:1}.${VERSION_CODE:1:1}.${VERSION_CODE:2} && echo $VERSION_NAME" after_script: - rm -f android-signing-keystore.jks || true artifacts: paths: - app/build/outputs + - app/build.gradle + tags: + - docker + +# https://levelup.gitconnected.com/semantic-versioning-and-release-automation-on-gitlab-9ba16af0c21 +fetch-semantic-version: + image: node:13 + stage: fetch-version + only: + refs: + - master + - alpha + - /^(([0-9]+)\.)?([0-9]+)\.x/ # This matches maintenance branches + - /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/ # This matches pre-releases + script: + - npm install @semantic-release/gitlab @semantic-release/exec @semantic-release/changelog @semantic-release/git -D + - npx semantic-release --generate-notes false --dry-run + - export VERSION_CODE=`grep -oP "versionCode[\s]*(\d)+" app/build.gradle | awk '{ print $2 }'` + - export VERSION_CODE=$((${VERSION_CODE}+1)) && echo ${VERSION_CODE} + - export VERSION_SHA=`echo ${CI_COMMIT_SHA:0:8}` && echo ${VERSION_SHA} + - export VERSION=`cat VERSION.txt` && echo ${VERSION} + - export VERSION_NAME=${VERSION}-${VERSION_SHA} && echo ${VERSION_NAME} + - sed -i -e "s/versionCode .*/versionCode ${VERSION_CODE}/g" app/build.gradle + - sed -i -e "s/versionName .*/versionName \"${VERSION_NAME}\"/g" app/build.gradle + - echo ${VERSION_CODE} > VERSION_CODE.txt + - echo ${VERSION_NAME} > VERSION_NAME.txt + artifacts: + paths: + - VERSION.txt + - VERSION_CODE.txt + - VERSION_NAME.txt + - app/build.gradle + tags: + - docker + +generate-non-semantic-version: + stage: fetch-version + except: + refs: + - master + - alpha + - /^(([0-9]+)\.)?([0-9]+)\.x/ # This matches maintenance branches + - /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/ # This matches pre-releases + script: + - echo build-$CI_PIPELINE_ID > VERSION.txt + artifacts: + paths: + - VERSION.txt tags: - docker @@ -65,6 +108,16 @@ buildDebug: script: - bundle exec fastlane buildDebug +testDebug: + image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG + stage: test + dependencies: + - buildDebug + script: + - bundle exec fastlane test + tags: + - docker + buildRelease: extends: .build_job script: @@ -76,32 +129,26 @@ buildRelease: except: - branches -testDebug: - image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG - stage: test - dependencies: - - buildDebug - script: - - bundle exec fastlane test - tags: - - docker - -publishGithub: - image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG - stage: internal - dependencies: - - buildRelease - when: manual - script: - - "export VERSION_CODE=`ls -f ./fastlane/metadata/android/en-US/changelogs | cut -d_ -f3 | sort -n | tail -1 | rev | cut -c5- | rev` && echo $VERSION_CODE" - - "export VERSION_SHA=`echo ${CI_COMMIT_SHA:0:8}` && echo $VERSION_SHA" - - "export VERSION_NAME=${VERSION_CODE:0:1}.${VERSION_CODE:1:1}.${VERSION_CODE:2} && echo $VERSION_NAME" - - ci-scripts/make-github-release.sh - tags: - - docker +release: + image: node:13 + stage: release only: - - /^v[0-9]*\.[0-9]*\.[0-9]*$/i - + refs: + - master + - alpha + # This matches maintenance branches + - /^(([0-9]+)\.)?([0-9]+)\.x/ + # This matches pre-releases + - /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/ + script: + - npm install @semantic-release/gitlab @semantic-release/exec @semantic-release/changelog @semantic-release/git -D + - npx semantic-release + artifacts: + paths: + - CHANGELOG.md + tags: + - docker + publishInternal: image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG stage: internal @@ -120,6 +167,21 @@ publishInternal: only: - /^v[0-9]*\.[0-9]*\.[0-9]*$/i +publishGithub: + image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG + stage: internal + dependencies: + - buildRelease + when: manual + script: + - export VERSION_CODE=`cat VERSION_CODE.txt` + - export VERSION_NAME=`cat VERSION_NAME.txt` + - ci-scripts/make-github-release.sh + tags: + - docker + only: + - /^v[0-9]*\.[0-9]*\.[0-9]*$/i + .promote_job: image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG when: manual @@ -160,4 +222,4 @@ promoteProduction: script: - bundle exec fastlane promote_beta_to_production tags: - - docker \ No newline at end of file + - docker diff --git a/.releaserc.yml b/.releaserc.yml new file mode 100644 index 0000000..70e6c5d --- /dev/null +++ b/.releaserc.yml @@ -0,0 +1,25 @@ +--- +plugins: + - "@semantic-release/commit-analyzer" + - - "@semantic-release/release-notes-generator" + - linkReferences: false + linkCompare: false + - - "@semantic-release/exec" + - verifyReleaseCmd: "echo ${nextRelease.version} > VERSION.txt" + generateNotesCmd: "if [[ ! -f RELEASE_NOTES.txt ]]; then echo '${nextRelease.notes.trim()}' > RELEASE_NOTES.txt; fi && echo '${nextRelease.notes.trim()}' > fastlane/metadata/android/en-US/changelogs/$(cat VERSION_CODE.txt).txt" + - - "@semantic-release/changelog" + - changelogFile: CHANGELOG.md + - - "@semantic-release/git" + - assets: + - 'app/build.gradle' + - 'CHANGELOG.md' + - 'VERSION.txt' + - "fastlane/metadata/android/en-US/changelogs/*.txt" + message: "chore(release): ${nextRelease.version} [only cd]\n\n${nextRelease.notes}" + - "@semantic-release/gitlab" + +branches: + - "master" + - "+([0-9])?(.{+([0-9]),x}).x" + - name: "alpha" + prerelease: "alpha" diff --git a/README.md b/README.md index f401516..adfa1b2 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,8 @@ Reproducible builds currently does not work. ## Contribution Whether you have ideas, translations, design changes, code cleaning, or real heavy code changes, help is always welcome. +For your commits please follow: https://www.conventionalcommits.org + ## Donate diff --git a/VERSION.txt b/VERSION.txt new file mode 100644 index 0000000..61098d2 --- /dev/null +++ b/VERSION.txt @@ -0,0 +1 @@ +1.0.55 \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0f94fb4..e8476ea 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,8 +44,8 @@ android { applicationId "net.schueller.peertube" minSdkVersion 21 targetSdkVersion 29 - versionCode Integer.valueOf(System.getenv("VERSION_CODE") ?: 1) - versionName System.getenv("VERSION_NAME") + "-" + System.getenv("VERSION_SHA") + versionCode 1055 + versionName "1.0.55-73487634" buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -172,4 +172,4 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { kotlinOptions { jvmTarget = "1.8" } -} \ No newline at end of file +} diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c05bea4..b33273b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -347,4 +347,12 @@ Das Serververzeichnis ist leer Hallo leeres Fragment Liste filtern + Sie sind dabei, die gesamte SSL-Zertifizierungsprüfung in Thorium zu deaktivieren. Die Deaktivierung kann sehr gefährlich sein, wenn der Peertube-Server nicht unter Ihrer Kontrolle steht, da ein Man-in-the-Middle-Angriff den Datenverkehr ohne Ihr Wissen auf einen anderen Server leiten könnte. Ein Angreifer könnte Passwörter und andere persönliche Daten aufzeichnen. + Ja + Nein + Warnung! + Erweitert + Speichern + SSL-Zertifikatsprüfung deaktivieren + Unsichere Verbindungen ignorieren. Verwenden Sie dies nur, wenn Sie den Server kennen, mit dem Sie sich verbinden. Erfordert einen Neustart der App. \ No newline at end of file diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 29f9719..cd3d3e5 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -40,7 +40,7 @@ Vaaleanvihreä luba (Katanga) Tämä salasana on liian lyhyt - Yleiskatsaus + Etusivu indonesia iiri Tilaukset @@ -57,7 +57,7 @@ amhara pandžabi Palvelin asetettu: %s - Pimeä tila + Tumma tila avaari telugu Jaa @@ -302,4 +302,57 @@ 0,75× Valitse kieli sovelluksen käyttöliittymälle. Käynnistä sovellus uudelleen, jotta muutos tulee voimaan. Sovelluksen kieli + Kokoamisnumero + AsetuksetToiminta2(SettingsActivity2) + Ohita epävarmat yhteydet. Käytä tätä, jos tiedät palvelimen, johon olet yhdistämässä. Vaatii sovelluksen uudelleen käynnistämisen. + Olet poistamassa käytöstä SSL-varmenteiden tarkituksen Thromiumissa. Tämän poistaminen käytöstä voi olla erittäin vaarallista, jos peertube-palvelin ei ole sinun hallinassasi, koska välistävetohyökkäys voi ohjata liikenteen toiseen palvelimeen tietämättäsi. Hyökkääjä voi tallentaa salasanojasi ja muita henkilötietojasi. + Tunnus päivitetty + Tunnuksen päivittäminen epäonnistui + Kelvollinen URL-osoite vaaditaan + Palvelimen tunniste vaaditaan + Palvelinkirja on tyhjä + Hei tyhjä osa + Suodatetut + Poista SSL-varmenteen tarkistus käytöstä + Taustatoisto + Jatka äänen taustatoistolla + Jatka kuva-kuvassa -tilassa + Haluatko varmasti poistaa tämän palvelimen osoitekirjasta\? + Kuva kuvassa -tilan lupa poistettu käytöstä Android-asetuksissa + Kuinka toistettava video regoi, kun se menee taustalle + Haluatko poistaa hakuhistorian pysyvästi\? + Verkkoyhteysvirhe, tarkista verkkoyhteys + Android-versio ei tue kuva-kuvassa -tilaa + Videoita: %s, Paikallisia videoita: %s + Ulkoasu + Pysäytä kaikki toistot + Ohje ja palaute + Videoluettelo + Tietoa + Keskeytä takaisin-napilla + Keskeytä toisto, kun painat takaisin-nappia videotoiston aikana. + Sopimaton sisältö + Tyhjennä hakuhistoria + Videotoisto + Etsi palvelin + Poista palvelin + Bengali (Bangladesh) + Osoitekirja + On kirjautunut + Palvelimen URL + Kirjaudu ulos + Kirjautuminen epäonnistui! + Kirjauduttu sisään + Tallenna + Kyllä + Ei + Varoitus! + Kehittyneet + Automaattinen + Tili + Lisää + Salasana + Käyttäjänimi + Hae + Leima \ No newline at end of file diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 75d6f85..4acf97e 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -348,11 +348,11 @@ Erro de acesso à rede, verifique sua conectividade Filtrar a lista Avançado - Você está prestes a desativar toda a validação de certificação SSL no Thorium. Desativar isso pode ser muito perigoso se o servidor peertube não estiver sob seu controle, pois um ataque man-in-the-middle pode direcionar tráfego para outro servidor sem seu conhecimento. Um atacador pode gravar senhas e outros dados pessoais. + Você está prestes a desativar toda a validação de certificação SSL no Thorium. Desativar isso pode ser muito perigoso se o servidor peertube não estiver sob seu controle, pois um ataque man-in-the-middle pode direcionar tráfego para outro servidor sem seu conhecimento. Um invasor pode gravar senhas e outros dados pessoais. Sim Não Aviso! Salvar Desativar check do certificado SSL - Ignorar conexões não seguras. Use isto apenas se você conhece o servidor ao qual está se conectando. Requer o reinício do app. + Ignorar conexões não seguras. Use isto apenas se você conhece o servidor ao qual está se conectando. Requer o reinício do aplicativo. \ No newline at end of file diff --git a/fastlane/metadata/android/de-DE/changelogs/1050.txt b/fastlane/metadata/android/de-DE/changelogs/1050.txt new file mode 100644 index 0000000..15119b1 --- /dev/null +++ b/fastlane/metadata/android/de-DE/changelogs/1050.txt @@ -0,0 +1,2 @@ +- Unterstützung für die Deaktivierung von SSL hinzufügt +- Übersetzungen diff --git a/fastlane/metadata/android/de-DE/changelogs/1051.txt b/fastlane/metadata/android/de-DE/changelogs/1051.txt new file mode 100644 index 0000000..1a402f8 --- /dev/null +++ b/fastlane/metadata/android/de-DE/changelogs/1051.txt @@ -0,0 +1,5 @@ +- Standardsprache der App beim ersten Start festgelegt (@kosharskiy) +- Bildschirmeinstellungen Übersetzungen uk und ru Sprache (@kosharskiy) +- app/build.gradle-Datei aufgeräumt (@kosharskiy) +- Problem mit der Anzeige von Video-Metadaten behoben (@kosharskiy) +- Übersetzungen aktualisiert diff --git a/fastlane/metadata/android/de-DE/changelogs/1052.txt b/fastlane/metadata/android/de-DE/changelogs/1052.txt new file mode 100644 index 0000000..d8dfb28 --- /dev/null +++ b/fastlane/metadata/android/de-DE/changelogs/1052.txt @@ -0,0 +1,2 @@ +- Server bearbeiten im Serverbuch implementiert (@kosharskiy) +- Übersetzungen aktualisiert diff --git a/fastlane/metadata/android/fi-FI/changelogs/1047.txt b/fastlane/metadata/android/fi-FI/changelogs/1047.txt new file mode 100644 index 0000000..111b653 --- /dev/null +++ b/fastlane/metadata/android/fi-FI/changelogs/1047.txt @@ -0,0 +1 @@ +- Todennuspäivitys diff --git a/fastlane/metadata/android/fi-FI/changelogs/1050.txt b/fastlane/metadata/android/fi-FI/changelogs/1050.txt new file mode 100644 index 0000000..7fd40a0 --- /dev/null +++ b/fastlane/metadata/android/fi-FI/changelogs/1050.txt @@ -0,0 +1,2 @@ +- lisää tuen poistaa käytöstä SSL +- käännökset diff --git a/fastlane/metadata/android/fi-FI/changelogs/1052.txt b/fastlane/metadata/android/fi-FI/changelogs/1052.txt new file mode 100644 index 0000000..7ae3697 --- /dev/null +++ b/fastlane/metadata/android/fi-FI/changelogs/1052.txt @@ -0,0 +1,2 @@ +- Implemented edit server in server book (@kosharskiy) + - Päivitetyt käännökset diff --git a/fastlane/metadata/android/fi-FI/full_description.txt b/fastlane/metadata/android/fi-FI/full_description.txt new file mode 100644 index 0000000..505047a --- /dev/null +++ b/fastlane/metadata/android/fi-FI/full_description.txt @@ -0,0 +1 @@ +Throium on epävirallinen PeerTube -videosoitin diff --git a/fastlane/metadata/android/fi-FI/short_description.txt b/fastlane/metadata/android/fi-FI/short_description.txt new file mode 100644 index 0000000..505047a --- /dev/null +++ b/fastlane/metadata/android/fi-FI/short_description.txt @@ -0,0 +1 @@ +Throium on epävirallinen PeerTube -videosoitin diff --git a/fastlane/metadata/android/fi-FI/title.txt b/fastlane/metadata/android/fi-FI/title.txt new file mode 100644 index 0000000..843fdbc --- /dev/null +++ b/fastlane/metadata/android/fi-FI/title.txt @@ -0,0 +1 @@ +Thorium epävirallinen PeerTube -asiakasohjelma diff --git a/fastlane/metadata/android/fi-FI/video.txt b/fastlane/metadata/android/fi-FI/video.txt new file mode 100644 index 0000000..5824a09 --- /dev/null +++ b/fastlane/metadata/android/fi-FI/video.txt @@ -0,0 +1 @@ +https://www.youtube.com/watch?v=PJIsiuSdpq8 diff --git a/fastlane/metadata/android/ru-RU/changelogs/1050.txt b/fastlane/metadata/android/ru-RU/changelogs/1050.txt new file mode 100644 index 0000000..2a8fcfe --- /dev/null +++ b/fastlane/metadata/android/ru-RU/changelogs/1050.txt @@ -0,0 +1,2 @@ +- Добавлена поддержка отключения SSL + - Переводы diff --git a/fastlane/metadata/android/ru-RU/changelogs/1051.txt b/fastlane/metadata/android/ru-RU/changelogs/1051.txt new file mode 100644 index 0000000..0aa5e98 --- /dev/null +++ b/fastlane/metadata/android/ru-RU/changelogs/1051.txt @@ -0,0 +1,5 @@ +- Исправлен язык приложения по умолчанию при первом запуске (@kosharskiy) + - Перевод настроек экрана на uk и ru языки (@kosharskiy) + - Файл очистки app/build.gradle (@kosharskiy) + - Исправлена проблема с отображением метаданных видео (@kosharskiy) + - Обновленные переводы diff --git a/fastlane/metadata/android/ru-RU/changelogs/1052.txt b/fastlane/metadata/android/ru-RU/changelogs/1052.txt new file mode 100644 index 0000000..f1e8d28 --- /dev/null +++ b/fastlane/metadata/android/ru-RU/changelogs/1052.txt @@ -0,0 +1,2 @@ +- Реализовано редактирование сервера в серверной книге (@kosharskiy) + - Обновлены переводы