525919c04f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
Upstream change too close to a glitch-soc-specific string.
The glitch-soc-specific string should not have been in this file, so it
has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
Upstream refactored a part, that as usual is split and duplicated in various
pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
Upstream fixed custom.css path in a different way than we did, went with
upstream's change.
2 years ago
426c456a59
Clarify language RE secondary toot button ( #1851 )
2 years ago
15b64d2f6b
Translate: Korean ( #1790 )
...
* Translate Korean: glitch frontend
* Translate Korean: backend
* Remove unused string
* Fix yaml
2 years ago
7ebf924259
Add missing locales to glitch-soc
3 years ago
fba55e8a1a
translation glitch's web interface [ja]
...
Squashed commit of the following:
commit f8c339b4dafd7347c5e824191dbf28d770d6583d
Author: atsuchan <83960488+atsu1125@users.noreply.github.com>
Date: Sat Oct 23 20:24:28 2021 +0900
translation glitch's web interface [ja]
commit a9520d5c5fb21490fa66c51bf1063f1edb9150ff
Author: atsu1125 <mastodon@atsuchan.page>
Date: Sat Oct 23 15:21:55 2021 +0900
translation glitch's web interface [ja]
commit 699848f2abff24be149c4a1c623df8b920ef2ed9
Author: atsu1125 <mastodon@atsuchan.page>
Date: Sat Oct 23 13:23:39 2021 +0900
translation glitch's web interface [ja]
3 years ago
a9fa4c4eec
translation glitch's client setting interface [ja]
3 years ago
fa3b53c396
Add zh-CN translations
3 years ago
24fc31470d
Add missing Korean translations
3 years ago
f86e361999
Add Korean translations
3 years ago
d588f99b07
Add missing locales to glitch flavor
4 years ago
f4f0745a6f
Glitchsoc translation to 'es' language ( #1439 )
...
glitch-soc-specific translation to 'es' language
4 years ago
aa29b38f7c
Add glitch-soc front-end support for many upstream translations
5 years ago
1a7df2f80a
Fix build issues due to the “pt” locale being renamed to “pt-PT”
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
981a41ca2c
Add option to hide action bar in collapsed toots
6 years ago
92919b25d7
change translation glitch's features [ja]
6 years ago
368d8beaf8
translation glitch's features [ja]
6 years ago
55f3a1a989
🌍 : 🇵🇱 ⬆️
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
fe3a9f5ea4
Add missing Japanese translation
7 years ago
6be6f6f5bd
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
95459fc5bd
Show SENSITIVE tag on sensitive images ( #267 )
7 years ago
aa02511e1c
Update ja.js
7 years ago
e5a10a1fd3
Threaded mode~
7 years ago
77cb2d04f9
Styling and autosuggest fixes for #293
7 years ago
1ba0732b82
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
58e3bd4d71
Add en and ja
7 years ago
cbc2f1ea5d
Update ja.js
7 years ago
b9d1543f7e
Update ja.js
7 years ago
6bfbeb1fe1
add ja
7 years ago
252de634bb
Merge pull request #250 from chriswmartin/fav-confirm-modal
...
add favourite confirmation modal
7 years ago
b07111ceba
add comma
7 years ago
3e6949b554
" => '
7 years ago
5cd4e577c2
Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles
...
# Conflicts:
# app/javascript/glitch/locales/ja.json
7 years ago
2f56e7e00d
use single quotes in locale entry
7 years ago
34630e00cb
pulled master, moved locale entry to new location
7 years ago
bb65adc0c0
Move ja localization to new locaiton
7 years ago
b27126f1d6
Linting fixes
7 years ago
99e8710095
Javascript intl8n flavour support
7 years ago
Claire
prplecake
Jeong Arm
atsu1125
Julianne420
Thibaut Girka
otrapersona
Spencer Alves
霧島ひなた
Marcin Mikołajczak
imncls
kibigo!
ncls7615
beatrix
cwm