forked from github/schildichat-desktop
Compare commits
No commits in common. "v1.11.33-sc.0.test.1" and "v1.11.4-sc.0.test.2" have entirely different histories.
v1.11.33-s
...
v1.11.4-sc
28 changed files with 25 additions and 323 deletions
|
|
@ -1 +0,0 @@
|
|||
release/
|
||||
17
.github/workflows/stale.yml
vendored
17
.github/workflows/stale.yml
vendored
|
|
@ -1,17 +0,0 @@
|
|||
name: 'Close stale issues'
|
||||
on:
|
||||
schedule:
|
||||
- cron: '30 1 * * *'
|
||||
|
||||
jobs:
|
||||
stale:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/stale@v6
|
||||
with:
|
||||
stale-issue-message: 'This issue is stale because it has been open 150 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
|
||||
days-before-issue-stale: 150
|
||||
days-before-issue-close: 14
|
||||
days-before-pr-stale: -1
|
||||
days-before-pr-close: -1
|
||||
exempt-issue-labels: 'longterm,enhancement,parity-with-android,prio:medium,prio:high,electron issue,encrypted room search,build infrastructure'
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
ARG NODE_VERSION
|
||||
FROM node:${NODE_VERSION}
|
||||
|
||||
RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \
|
||||
curl \
|
||||
g++ \
|
||||
gcc \
|
||||
git \
|
||||
jq \
|
||||
libarchive-tools \
|
||||
libsecret-1-dev \
|
||||
libsqlcipher-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
openssl \
|
||||
pkg-config \
|
||||
python \
|
||||
tcl \
|
||||
vim
|
||||
|
||||
ENV RUSTUP_HOME=/usr/local/rustup \
|
||||
CARGO_HOME=/usr/local/cargo \
|
||||
PATH=/usr/local/cargo/bin:$PATH
|
||||
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal
|
||||
|
||||
COPY . /project
|
||||
WORKDIR /project
|
||||
|
||||
# There might be remnants of the host which break the build
|
||||
RUN make fixup
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
FROM fedora:latest
|
||||
|
||||
RUN dnf install -y openssl openssl-devel rust cargo llvm libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
|
||||
|
||||
# node setup
|
||||
ARG NODE_VERSION
|
||||
RUN mkdir -p /usr/local/n
|
||||
RUN mkdir -p /usr/local/bin /usr/local/lib /usr/local/include /usr/local/share
|
||||
RUN curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
|
||||
RUN bash n ${NODE_VERSION}
|
||||
RUN npm install -g n
|
||||
RUN npm install -g yarn
|
||||
RUN npm install -g node-gyp
|
||||
RUN gem install --no-user-install --no-document fpm
|
||||
|
||||
COPY . /project
|
||||
WORKDIR /project
|
||||
|
||||
# There might be remnants of the host which break the build
|
||||
RUN make fixup
|
||||
39
Makefile
39
Makefile
|
|
@ -1,18 +1,13 @@
|
|||
.PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
|
||||
.PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
|
||||
.PHONY: macos-common macos macos-mas macos-release macos-mas-release icns
|
||||
.PHONY: container-build-debian container-build-fedora
|
||||
.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release
|
||||
.PHONY: clean undo_setup fixup
|
||||
.PHONY: fix_yarn_cache
|
||||
.PHONY: clean
|
||||
|
||||
CFGDIR ?= configs/sc
|
||||
|
||||
all: web
|
||||
|
||||
YARN ?= yarnpkg
|
||||
CONTAINER_ENGINE ?= podman
|
||||
NODE_VERSION ?= 16
|
||||
|
||||
VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
|
||||
WEB_APP_NAME := $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
|
||||
|
|
@ -37,9 +32,6 @@ OUT_WIN64_PORTABLE_BETTER_NAME := $(PRODUCT_NAME)_win-portable_v$(VERSION)
|
|||
OUT_MACOS := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION)-universal.dmg
|
||||
OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app
|
||||
|
||||
CONTAINER_IMAGE_DEBIAN := schildichat-desktop-containerbuild-debian
|
||||
CONTAINER_IMAGE_FEDORA := schildichat-desktop-containerbuild-fedora
|
||||
|
||||
RELEASE_DIR := release
|
||||
CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)
|
||||
|
||||
|
|
@ -161,31 +153,10 @@ macos-mas-release: macos-mas
|
|||
mkdir -p $(CURRENT_RELEASE_DIR)
|
||||
cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR)
|
||||
|
||||
container-build-debian:
|
||||
$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) .
|
||||
|
||||
container-build-fedora:
|
||||
$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) .
|
||||
|
||||
container-web-release: container-build-debian
|
||||
$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release
|
||||
|
||||
container-debian-release: container-build-debian
|
||||
$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release
|
||||
|
||||
container-rpm-release: container-build-fedora
|
||||
$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release
|
||||
|
||||
container-appimage-release: container-build-debian
|
||||
$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release
|
||||
|
||||
bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock
|
||||
./build-bom.sh
|
||||
bom: bom.lock
|
||||
|
||||
fix_yarn_cache:
|
||||
$(YARN) cache list || $(YARN) cache clean
|
||||
|
||||
clean:
|
||||
$(YARN) --cwd matrix-js-sdk clean
|
||||
$(YARN) --cwd matrix-react-sdk clean
|
||||
|
|
@ -195,11 +166,3 @@ clean:
|
|||
rm -rf element-web/dist
|
||||
rm -rf local-pkgbuild
|
||||
rm -f bom.lock
|
||||
|
||||
undo_setup:
|
||||
rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak
|
||||
|
||||
fixup: undo_setup fix_yarn_cache
|
||||
make setup
|
||||
make clean
|
||||
make setup
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ The following are the dependencies required to build SchildiChat Web/Desktop on
|
|||
```
|
||||
# apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools openssl libssl-dev tcl
|
||||
|
||||
# curl -sL https://deb.nodesource.com/setup_16.x | bash -
|
||||
# curl -sL https://deb.nodesource.com/setup_14.x | bash -
|
||||
# apt update
|
||||
# apt install nodejs
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,6 @@
|
|||
{
|
||||
"update_base_url": null,
|
||||
"default_server_config": {
|
||||
"m.homeserver": {
|
||||
"base_url": "https://matrix-client.matrix.org",
|
||||
"server_name": "matrix.org"
|
||||
}
|
||||
},
|
||||
"default_server_name": "matrix.org",
|
||||
"brand": "SchildiChat",
|
||||
"integrations_ui_url": "https://scalar.vector.im/",
|
||||
"integrations_rest_url": "https://scalar.vector.im/api",
|
||||
|
|
@ -16,13 +11,10 @@
|
|||
"https://scalar-staging.vector.im/api",
|
||||
"https://scalar-staging.riot.im/scalar/api"
|
||||
],
|
||||
"show_labs_settings": true,
|
||||
"room_directory": {
|
||||
"showLabsSettings": true,
|
||||
"roomDirectory": {
|
||||
"servers": [
|
||||
"matrix.org",
|
||||
"gitter.im",
|
||||
"libera.chat",
|
||||
"schildi.chat"
|
||||
"matrix.org"
|
||||
]
|
||||
},
|
||||
"enable_presence_by_hs_url": {
|
||||
|
|
|
|||
|
|
@ -20,11 +20,8 @@ debdate=$(date +%Y-%m-%d -r $debpath)
|
|||
pushd "$repopath" > /dev/null
|
||||
|
||||
git fetch
|
||||
git checkout master
|
||||
git reset --hard origin/master
|
||||
|
||||
git checkout -B "release-v$version"
|
||||
|
||||
yamlFile="chat.schildi.desktop.yaml"
|
||||
xmlFile="chat.schildi.desktop.metainfo.xml"
|
||||
|
||||
|
|
@ -36,8 +33,8 @@ sed -i "s|^\s\s<releases>$| <releases>\n <release version=\"$version\" date=
|
|||
git add $yamlFile $xmlFile
|
||||
git commit -m "Bump version to v$version"
|
||||
|
||||
git push -f --set-upstream origin "release-v$version"
|
||||
git push
|
||||
|
||||
popd > /dev/null
|
||||
|
||||
echo "Release v$version published on flathub, now merge that branch as PR: https://github.com/flathub/chat.schildi.desktop/"
|
||||
echo "Release v$version published on flathub!"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 16d3620517cd22e92b52807bc7eb6cc8b4414780
|
||||
Subproject commit c5897c9412e17c29c43f721c3c48cec500911b4f
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit e5afedfac20168e491fc9a2b59cd1c8a07c3c35c
|
||||
Subproject commit 7a9cdfe392ad351b16ee261b9e3ee9ec5782fb67
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
mydir="$(dirname "$(realpath "$0")")"
|
||||
|
||||
pushd "$mydir" > /dev/null
|
||||
|
||||
source ./merge_helpers.sh
|
||||
|
||||
# Check branch
|
||||
check_branch $branch
|
||||
forall_repos check_branch $branch
|
||||
|
||||
# Ensure clean git state
|
||||
forall_repos check_clean_git
|
||||
|
||||
# Fetch upstream
|
||||
forall_repos git fetch origin > /dev/null 2>/dev/null
|
||||
forall_repos git fetch upstream > /dev/null 2>/dev/null
|
||||
|
||||
(
|
||||
# Add new line below git log: https://unix.stackexchange.com/a/345558
|
||||
|
||||
get_latest_upstream_tag
|
||||
forelement_repos git log --pretty=format:"- %s" "sc" "^$latest_upstream_tag" "^master" \
|
||||
| printf '%s\n' "$(cat)" \
|
||||
| sed "s|Merge tag '\\(.*\\)' into sc.*|Update codebase to Element \1|" \
|
||||
| sed "s|Merge tag '\\(.*\\)' into merge.*|Update codebase to Element \1|"
|
||||
|
||||
get_current_mxsdk_tags
|
||||
|
||||
pushd "matrix-js-sdk" > /dev/null
|
||||
git log --pretty=format:"- %s" "sc" "^$current_mxjssdk_tag" "^master" \
|
||||
| printf '%s\n' "$(cat)" \
|
||||
| grep -v "Merge .*tag"
|
||||
popd > /dev/null
|
||||
|
||||
pushd "matrix-react-sdk" > /dev/null
|
||||
git log --pretty=format:"- %s" "sc" "^$current_mxreactsdk_tag" "^master" \
|
||||
| printf '%s\n' "$(cat)" \
|
||||
| grep -v "Merge .*tag"
|
||||
popd > /dev/null
|
||||
) \
|
||||
| grep -v "Automatic i18n reversion" \
|
||||
| grep -v "Automatic package.json reversion" \
|
||||
| grep -v "Merge .*branch" \
|
||||
| grep -v "Automatic theme update" \
|
||||
| grep -v "Automatic package.json adjustment" \
|
||||
| grep -v "Automatic i18n adjustment" \
|
||||
| grep -v "Update version to .*-sc\\..*" \
|
||||
| grep -v "\\.sh" \
|
||||
| grep -v "\\.md" \
|
||||
| grep -v "Added translation using Weblate" \
|
||||
| grep -v "Translated using Weblate" \
|
||||
| grep -v "weblate/sc" \
|
||||
| grep -v "\\[.*merge.*\\]" \
|
||||
| awk '!seen[$0]++' `# https://stackoverflow.com/a/1444448` \
|
||||
|| echo "No significant changes since the last stable release"
|
||||
|
||||
popd > /dev/null
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
mydir="$(dirname "$(realpath "$0")")"
|
||||
|
||||
cd "$mydir"
|
||||
|
||||
source ./merge_helpers.sh
|
||||
|
||||
# Note: this doesn't delete files starting with a dot,
|
||||
# and in particular not the '.git' directory, which we
|
||||
# want to keep
|
||||
forall_repos bash -c 'rm -rf *'
|
||||
forall_repos git reset HEAD --hard
|
||||
|
|
@ -35,13 +35,7 @@ function writeStrings(p, strings) {
|
|||
let strings = readStrings(p);
|
||||
|
||||
for (const key of Object.keys(strings)) {
|
||||
strings[key] = strings[key]
|
||||
.replace(/Element/g, "SchildiChat")
|
||||
.replace(/element\.io/g, "schildi.chat")
|
||||
|
||||
// It's still Element Call
|
||||
.replace(/SchildiChat Call/g, "Element Call")
|
||||
.replace(/SchildiChat-Call/g, "Element-Call");
|
||||
strings[key] = strings[key].replace(/Element/g, "SchildiChat").replace(/element\.io/g, "schildi.chat");
|
||||
}
|
||||
|
||||
if (overlayPath) {
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
{
|
||||
"Show": "Mutat"
|
||||
}
|
||||
{}
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -21,8 +21,8 @@
|
|||
"MXID": "MXID",
|
||||
"In group chats": "Ve skupinových chatech",
|
||||
"In public rooms": "Ve veřejných místnostech",
|
||||
"All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí v Úvodu.",
|
||||
"Show all rooms in Home": "Zobrazit všechny místnosti v Úvodu",
|
||||
"All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí v domovském zobrazení.",
|
||||
"Show all rooms in Home": "Ukázat všechny místnosti v domovském zobrazení",
|
||||
"Show people in spaces": "Ukázat lidi v prostorech",
|
||||
"Show notification badges for People in Spaces": "Zobrazit odznaky oznámení pro Lidé v prostorech",
|
||||
"Return to the room previously opened in a space": "Návrat do dříve otevřené místnosti v prostoru",
|
||||
|
|
@ -50,6 +50,5 @@
|
|||
"Mixed": "Smíšené",
|
||||
"Sound pack": "Balíček zvuků",
|
||||
"Schildi: Softer sounds for reduced anxiety": "Schildi: Jemnější zvuky pro snížení úzkosti",
|
||||
"Classic: The same sharp sounds as Element": "Klasické: Stejně ostré zvuky jako Element",
|
||||
"React with \"%(reaction)s\"": "Reagovat pomocí \"%(reaction)s\""
|
||||
"Classic: The same sharp sounds as Element": "Klasické: Stejně ostré zvuky jako Element"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,6 +49,5 @@
|
|||
"Mixed": "Mixed",
|
||||
"Sound pack": "Sound pack",
|
||||
"Schildi: Softer sounds for reduced anxiety": "Schildi: Softer sounds for reduced anxiety",
|
||||
"Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element",
|
||||
"React with \"%(reaction)s\"": "React with \"%(reaction)s\""
|
||||
"Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,27 +3,5 @@
|
|||
"Show message bubbles on one side only": "Üzenetbuborékok megjelenítése csak az egyik oldalon",
|
||||
"Message bubbles": "Üzenet buborékok",
|
||||
"Show message bubbles depending on the width either on both sides or only on one side": "Üzenetbuborékok megjelenítése a szélességtől függően mindkét oldalon vagy csak az egyik oldalon",
|
||||
"Normal priority": "Normál prioritás",
|
||||
"Show people and rooms in a combined list": "Személyek és szobák megjelenítése egy egyesített listában",
|
||||
"Update notifications": "Értesítések frissítése",
|
||||
"Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Szeretne csatlakozni olyan szobához, amely értesíti Önt az új megjelenésekről? Ez különösen akkor hasznos, ha az Ön platformja nem támogatja a SchildiChat automatikus frissítéseit (pl. Windows és macOS).",
|
||||
"System": "Rendszer",
|
||||
"Show all rooms in Home": "Az összes szoba megjelenítése a kezdőoldalon",
|
||||
"All rooms you're in will appear in Home.": "Az összes szoba, amelyben tartózkodik, megjelenik a Kezdőlapon.",
|
||||
"Mark as read": "Olvasottnak jelöl",
|
||||
"Enable YouTube embed player": "YouTube beágyazott lejátszó engedélyezése",
|
||||
"Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "A Kezdőlap hasznos ahhoz, hogy mindenről áttekintést kapjunk. Ne feledje, hogy a kikapcsolásával bizonyos szobákat nem fog látni.",
|
||||
"Schildi: Softer sounds for reduced anxiety": "Schildi: Lágyabb hangok a kevesebb stresszért",
|
||||
"Sound pack": "Hangcsomag",
|
||||
"Classic: The same sharp sounds as Element": "Klasszikus: Ugyanazok az éles hangok, mint az Elementnél",
|
||||
"Don't ask again": "Ne kérdezze újra",
|
||||
"Light theme": "Világos téma",
|
||||
"Dark theme": "Sötét téma",
|
||||
"Mark as unread": "Olvasatlannak jelöl",
|
||||
"Collapse additional buttons": "További gombok összecsukása",
|
||||
"Theme": "Téma",
|
||||
"Room list": "Szobák listája",
|
||||
"Font size and typeface": "Betűméret és betűtípus",
|
||||
"Message layout": "Üzenetek elrendezése",
|
||||
"Modern": "Modern"
|
||||
"Normal priority": "Normál prioritás"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,6 +49,5 @@
|
|||
"Mixed": "Campur",
|
||||
"Sound pack": "Paket suara",
|
||||
"Schildi: Softer sounds for reduced anxiety": "Schildi: Suara lebih lembut untuk mengurangi kecemasan",
|
||||
"Classic: The same sharp sounds as Element": "Klasik: Suara keras yang biasa seperti Element",
|
||||
"React with \"%(reaction)s\"": "Reaksi dengan \"%(reaction)s\""
|
||||
"Classic: The same sharp sounds as Element": "Klasik: Suara keras yang biasa seperti Element"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,26 +9,5 @@
|
|||
"Light theme": "Tema chiaro",
|
||||
"Dark theme": "Tema scuro",
|
||||
"Normal priority": "Priorità normale",
|
||||
"Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Vuoi entrare in una stanza che ti notificherà riguardo nuove release? Sarebbe comodo particolarmente se la tua piattaforma non supporta aggiornamenti automatici (Come per esempio Windows o MacOS.)",
|
||||
"Show message bubbles on one side only": "Visualizza bolle messaggi su un lato solo",
|
||||
"Show message bubbles depending on the width either on both sides or only on one side": "Visualizza bolle messaggi in base alla lunghezza di entrambi i lati o di uno solo",
|
||||
"User name color mode": "Modalità colore nome utente",
|
||||
"Room list style": "Stile lista stanze",
|
||||
"Theme": "Tema",
|
||||
"Show all rooms in Home": "Visualizza tutte le stanze nella Home",
|
||||
"All rooms you're in will appear in Home.": "Tutte le stanze in cui partecipi appariranno nella Home.",
|
||||
"For people": "Per le persone",
|
||||
"Room list": "Lista stanze",
|
||||
"Show advanced theme settings": "Visualizza impostazioni avanzate tema",
|
||||
"Mark rooms as unread": "Permetti di segnare le chat come non lette",
|
||||
"Message bubbles": "Bolle messaggi",
|
||||
"Message layout": "Impaginazione messaggi",
|
||||
"Mark as unread": "Segna come non letto",
|
||||
"Uniform": "Uniforme",
|
||||
"Show people in spaces": "Visualizza persone negli spazi",
|
||||
"MXID": "MXID",
|
||||
"In public rooms": "Nelle stanze pubbliche",
|
||||
"In group chats": "Nelle chat di gruppo",
|
||||
"Font size and typeface": "Dimensione e tipo carattere",
|
||||
"Hide advanced theme settings": "Nascondi impostazioni avanzate tema"
|
||||
"Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Vuoi entrare in una stanza che ti notificherà riguardo nuove release? Sarebbe comodo particolarmente se la tua piattaforma non supporta aggiornamenti automatici (Come per esempio Windows o MacOS.)"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
{
|
||||
"Normal priority": "常優先度"
|
||||
}
|
||||
|
|
@ -17,37 +17,5 @@
|
|||
"In group chats": "Pokalbių grupėse",
|
||||
"In public rooms": "Viešuose kambariuose",
|
||||
"Show all rooms in Home": "Rodyti visus kambarius Pradžioje",
|
||||
"All rooms you're in will appear in Home.": "Visi kambariai kuriuose esate bus rodomi Pradžioje.",
|
||||
"Hide advanced theme settings": "Slėpti išplėstinius temos nustatymus",
|
||||
"Show advanced theme settings": "Rodyti išplėstinius temos nustatymus",
|
||||
"Theme": "Tema",
|
||||
"Font size and typeface": "Šrifto dydis ir raštas",
|
||||
"Show message bubbles depending on the width either on both sides or only on one side": "Rodyti žinučių burbulus, priklausomai nuo pločio, abiejose pusėse arba tik vienoje pusėje",
|
||||
"Sound pack": "Garso paketas",
|
||||
"Schildi: Softer sounds for reduced anxiety": "Schildi: švelnesni garsai sumažintam nerimui",
|
||||
"Classic: The same sharp sounds as Element": "Klasikiniai: Tie patys aštrūs garsai kaip ir Element",
|
||||
"Enable YouTube embed player": "Įgalinti YouTube įterptą grotuvą",
|
||||
"Add custom theme": "Pridėti pasirinktinę temą",
|
||||
"Mark as unread": "Žymėti kaip neskaitytą",
|
||||
"Mark as read": "Žymėti kaip perskaitytą",
|
||||
"User name color mode": "Naudotojo vardo spalvų režimas",
|
||||
"Uniform": "Vienodi",
|
||||
"Show notification badges for People in Spaces": "Rodyti pranešimų ženkliukus žmonėms erdvėse",
|
||||
"Return to the room previously opened in a space": "Grįžti į anksčiau atidarytą kambarį erdvėje",
|
||||
"If disabled, the space overview will be shown when switching to another space.": "Jei išjungta, perjungiant į kitą erdvę bus rodoma erdvės apžvalga.",
|
||||
"Room list style": "Kambarių sąrašo stilius",
|
||||
"Compact: tiny avatar together with name and preview in one line": "Kompaktiška: mažytis avataras kartu su vardu ir peržiūra vienoje eilutėje",
|
||||
"Intermediate: medium sized avatar with single-line preview": "Vidutinis: vidutinio dydžio avataras su vienos eilutės peržiūra",
|
||||
"Roomy: big avatar with two-line preview": "Erdvus: didelis avataras su dviejų eilučių peržiūra",
|
||||
"PowerLevel": "Galios lygis",
|
||||
"For people": "Žmonėms",
|
||||
"Show people in spaces": "Rodyti žmones erdvėse",
|
||||
"If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Jei išjungta, vis tiek galite pridėti tiesioginius pokalbius į asmenines erdves. Jei ši funkcija įjungta, automatiškai matysite visus, kurie yra erdvės nariai.",
|
||||
"Mark rooms as unread": "Leisti žymėti pokalbius kaip neskaitytus",
|
||||
"Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Pradžia yra naudinga, kad galėtumėte viską apžvelgti. Turėkite omenyje, kad ją išjungę galite nematyti tam tikrų kambarių.",
|
||||
"Collapse additional buttons": "Sulankstyti papildomus mygtukus",
|
||||
"Corners": "Kampai",
|
||||
"Round": "Apvalus",
|
||||
"Extra round": "Ypač apvalus",
|
||||
"Mixed": "Mišrus"
|
||||
"All rooms you're in will appear in Home.": "Visi kambariai kuriuose esate bus rodomi Pradžioje."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,6 +40,5 @@
|
|||
"Room list style": "Estilo da lista de salas",
|
||||
"Mark rooms as unread": "Permitir markar conversas como não lidos",
|
||||
"Mark as unread": "Markar como não lido",
|
||||
"Mark as read": "Markar como lido",
|
||||
"Collapse additional buttons": "Recolher botões adicionais"
|
||||
"Mark as read": "Markar como lido"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,13 +42,5 @@
|
|||
"Mark as unread": "标记为未读",
|
||||
"Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "主页对于概览所有消息来说非常有用。请注意：禁用主页可能会让您无法看到某些房间。",
|
||||
"Enable YouTube embed player": "启用 YouTube 嵌入式播放器",
|
||||
"Collapse additional buttons": "折叠额外的按钮",
|
||||
"Round": "圆角",
|
||||
"React with \"%(reaction)s\"": "与 \"%(reaction)s\" 互动",
|
||||
"Schildi: Softer sounds for reduced anxiety": "Schildi: 舒缓音效以减少焦虑",
|
||||
"Mixed": "混合",
|
||||
"Extra round": "超圆角",
|
||||
"Sound pack": "音频包",
|
||||
"Classic: The same sharp sounds as Element": "Classic: 与 Element 相同的尖锐声音",
|
||||
"Corners": "边缘"
|
||||
"Collapse additional buttons": "折叠额外的按钮"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 255144ef2c9e141a171101e18091961f1be6db7f
|
||||
Subproject commit 12f88b5b4ea4958c03c15bede071224080a50ded
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 9994f867123a10b78fae014c3fa1ef919d89487e
|
||||
Subproject commit d4472adb3a895e5b8d4bbcc435c3adac6e5ac170
|
||||
|
|
@ -23,13 +23,7 @@ automatic_i18n_reversion
|
|||
automatic_packagejson_reversion
|
||||
|
||||
# Merge upstream
|
||||
|
||||
# Check if specific version to merge passed
|
||||
if [ -z "$1" ]; then
|
||||
get_latest_upstream_tag
|
||||
else
|
||||
latest_upstream_tag="$1"
|
||||
fi
|
||||
get_latest_upstream_tag
|
||||
forelement_repos git merge "$latest_upstream_tag"
|
||||
|
||||
get_current_mxsdk_tags
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue