luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-21 12:47:58 +00:00
Code Issues Projects Releases Wiki Activity
16283 commits 1 branch 0 tags 248 MiB
Commit graph

17 commits

Author SHA1 Message Date
Claire 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
atsu1125 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
atsu1125 aa6269b08e translation glitch's client setting interface [ja] 2021-10-20 13:00:51 +09: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
imncls dd4ad6300b
Add missing Japanese translation 2018-04-14 07:53:56 +09:00
ncls7615 f5a4201ad8
Update ja.js 2018-01-07 01:51:49 +09:00
kibigo! e4bc013d6f Threaded mode~ 2018-01-05 21:16:43 -08:00
ncls7615 d3b2677775
Add en and ja 2017-12-19 20:16:48 +09:00
NCLS e9a5bde9a0
Update ja.js 2017-12-15 19:43:10 +09:00
NCLS 61ed5b972c
Update ja.js 2017-12-15 19:38:13 +09:00
ncls7615 b93ad3d0e8 add ja 2017-12-12 13:13:54 +09:00
ncls7615 d420e2f047 add comma 2017-12-11 09:50:52 +09:00
ncls7615 279231c5dd " => ' 2017-12-11 09:46:17 +09:00
ncls7615 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
kibigo! cd107e92cb Move ja localization to new locaiton 2017-12-10 11:09:59 -08:00
kibigo! b28cd6769c Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00