eee36267d6
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.
2022-10-30 18:15:28 +01:00
c19a3517a0
Clarify language RE secondary toot button ( #1851 )
2022-10-05 14:10:15 +02:00
bbda3592d8
Translate: Korean ( #1790 )
...
* Translate Korean: glitch frontend
* Translate Korean: backend
* Remove unused string
* Fix yaml
2022-05-31 11:41:30 +02:00
a22043ebff
Add missing locales to glitch-soc
2022-03-18 16:41:51 +01:00
dae377b3b5
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]
2021-10-24 00:05:33 +09:00
aa6269b08e
translation glitch's client setting interface [ja]
2021-10-20 13:00:51 +09:00
ebb4de7d3e
Add zh-CN translations
2021-10-07 23:40:18 +02:00
a61645ed30
Add missing Korean translations
2021-08-06 20:06:05 +02:00
69b5139d2a
Add Korean translations
2021-08-06 20:06:05 +02:00
3f09d4ca03
Add missing locales to glitch flavor
2020-11-12 22:27:44 +01:00
29870d2be6
Glitchsoc translation to 'es' language ( #1439 )
...
glitch-soc-specific translation to 'es' language
2020-10-19 22:17:29 +02:00
eeb8753adc
Add glitch-soc front-end support for many upstream translations
2020-01-20 16:43:18 +01:00
0a1d9032f7
Fix build issues due to the “pt” locale being renamed to “pt-PT”
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-18 17:27:12 +02:00
4e60a0d543
Add option to hide action bar in collapsed toots
2018-09-30 08:31:50 +02:00
5c9a2f5d77
change translation glitch's features [ja]
2018-09-21 10:55:44 +02:00
5c6271887d
translation glitch's features [ja]
2018-09-21 10:55:44 +02:00
deb91f5989
🌍 : 🇵🇱 ⬆️
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-04-27 14:15:38 +02:00
dd4ad6300b
Add missing Japanese translation
2018-04-14 07:53:56 +09:00
ee7217bc94
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-12 23:08:51 +01:00
5d2ef7a616
Show SENSITIVE tag on sensitive images ( #267 )
2018-01-08 18:25:29 -08:00
f5a4201ad8
Update ja.js
2018-01-07 01:51:49 +09:00
e4bc013d6f
Threaded mode~
2018-01-05 21:16:43 -08:00
ad10a80a99
Styling and autosuggest fixes for #293
2018-01-05 20:43:16 -08:00
0f69a90588
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-04 14:42:58 +01:00
d3b2677775
Add en and ja
2017-12-19 20:16:48 +09:00
e9a5bde9a0
Update ja.js
2017-12-15 19:43:10 +09:00
61ed5b972c
Update ja.js
2017-12-15 19:38:13 +09:00
b93ad3d0e8
add ja
2017-12-12 13:13:54 +09:00
08b0861b96
Merge pull request #250 from chriswmartin/fav-confirm-modal
...
add favourite confirmation modal
2017-12-10 23:10:19 -05:00
d420e2f047
add comma
2017-12-11 09:50:52 +09:00
279231c5dd
" => '
2017-12-11 09:46:17 +09:00
a98b0a47ef
Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles
...
# Conflicts:
# app/javascript/glitch/locales/ja.json
2017-12-11 09:43:21 +09:00
0466aa8d08
use single quotes in locale entry
2017-12-10 15:39:23 -06:00
072ab191cc
pulled master, moved locale entry to new location
2017-12-10 15:22:15 -06:00
cd107e92cb
Move ja localization to new locaiton
2017-12-10 11:09:59 -08:00
6b7085a33e
Linting fixes
2017-12-10 11:08:04 -08:00
b28cd6769c
Javascript intl8n flavour support
2017-12-10 11:08:04 -08:00
Claire