fde91988ab
Update ja.yml
7 years ago
8ca91cef45
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
a0047fdca0
i18n: 🇵🇱 ( #5903 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
12cea76634
Update Chinese (Simplified) translations for version 2.1.0rc1 ( #5849 )
...
* i18n: (zh-CN) Add missing translations for multiple PRs.
Related PRs: #5838 #5762 #5835 #5837 #5832 #5823 #5814 #5757
* i18n: (zh-CN) Fix translation for #5823 / #5835
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Change `发送者` to `作者`
* i18n: (zh-CN) Add missing translations for #5862
* i18n: (zh-CN) Add missing translation for #5874
* i18n: (zh-CN) Improve translations for keyboard shortcuts
7 years ago
5bed0f10ed
Various fixes
7 years ago
d9800a5647
Merge branch 'gs-master' into glitch-theme
7 years ago
1c74ede69e
Fixed a name + localizations
7 years ago
bc4fa6b198
Rename themes -> flavours ? ?
7 years ago
933eafdcd3
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
51f2eca887
Add Japanese translations for invite filter. ( #5869 )
7 years ago
b15482ce71
i18n: 🇵🇱 ( #5865 )
7 years ago
74320971e2
Add invite filter ( #5862 )
7 years ago
541fe9b110
Skins support
7 years ago
d020ed1e05
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
82ab9736d5
i18n: 🇵🇱 ( #5851 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
a62039df27
Update Japanese translations. ( #5844 )
7 years ago
3614912be2
Normalize pl translation.
7 years ago
95c270f5b1
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
15fab79cfa
Show "expired" in invite index ( #5838 )
...
* Show "expired" in invite index
* "Force expire" -> "Deactivate"
7 years ago
1b57d4dd3a
Fix account migration feature ( #5837 )
...
* Make removable account migration
* Fix error during update of account migration setting
* Add notice when update account migration setting
7 years ago
d937a59997
i18n: 🇵🇱 ( #5841 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
7463d80ff4
Merge remote-tracking branch 'tootsuite/master'
7 years ago
8bad6bdd00
Normalize config/locales/en.yml.
7 years ago
706e534455
Add UI for setting up account migration ( #5832 )
7 years ago
63d47e04c4
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
c6b7c77229
i18n: Update ja translation for consumable invites. ( #5829 )
...
* Add Japanese translation for consumable invites.
* Add Japanese translation.
* Update Japanese translation.
7 years ago
e77c3996a5
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
740f8a95a9
Add consumable invites ( #5814 )
...
* Add consumable invites
* Add UI for generating invite codes
* Add tests
* Display max uses and expiration in invites table, delete invite
* Remove unused column and redundant validator
- Default follows not used, probably bad idea
- InviteCodeValidator is redundant because RegistrationsController
checks invite code validity
* Add admin setting to disable invites
* Add admin UI for invites, configurable role for invite creation
- Admin UI that lists everyone's invites, always available
- Admin setting min_invite_role to control who can invite people
- Non-admin invite UI only visible if users are allowed to
* Do not remove invites from database, expire them instantly
7 years ago
5de42665d7
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
d07983b56d
Updated Catalan strings ( #5801 )
...
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
7 years ago
86f4f8e158
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
7a45d382ea
i18n: Update ja translations ( #5804 )
...
* Add Japanese translations.
* Update Japanese translations.
* Fix japanese translation.
7 years ago
167fe2ab08
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
e84fecb7e9
Add logging of admin actions ( #5757 )
...
* Add logging of admin actions
* Update brakeman whitelist
* Log creates, updates and destroys with history of changes
* i18n: Update Polish translation (#5782 )
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* Split admin navigation into moderation and administration
* Redesign audit log page
* 🇵🇱 (#5795 )
* Add color coding to audit log
* Change dismiss->resolve, log all outcomes of report as resolve
* Update terminology (e-mail blacklist) (#5796 )
* Update terminology (e-mail blacklist)
imho looks better
* Update en.yml
* Fix code style issues
* i18n-tasks normalize
7 years ago
41c71565c2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
bc4a726c24
i18n: (zh-CN) Add translations for #5746 & #5735 ( #5764 )
7 years ago
2a5af9c10c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
fc2155019b
Add Japanese translations. ( #5769 )
7 years ago
1a07b83c69
i18n: Update Polish translation - back-end ( #230 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
53b7b81b43
Update and fix Catalan translation ( #5773 )
...
* Update activerecord.ca.yml
* Update ca.yml
* Update devise.ca.yml
* Update doorkeeper.ca.yml
* Update simple_form.ca.yml
* fix syntax error for ca translation
* fix syntax errors in ca translations
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
d083f7741a
Merge remote-tracking branch 'tootsuite/master'
7 years ago
08deec4c84
i18n: Update ja translation for moderator badge. ( #5731 )
...
* Update Japanese translation for moderator badge.
* Follows English notation
7 years ago
3d1d3d9a20
Remove translations of default theme ( #5741 )
7 years ago
bfdcf76a64
Add “staff” badge to admin user pages ( #5735 )
...
* Allow staff badge to change from setting to hidden
* i18n: Update Polish translation
7 years ago
b380e9d2cb
i18n: Update Polish translation ( #5749 )
7 years ago
58cede4808
Profile redirect notes ( #5746 )
...
* Serialize moved accounts into REST and ActivityPub APIs
* Parse federated moved accounts from ActivityPub
* Add note about moved accounts to public profiles
* Add moved account message to web UI
* Fix code style issues
7 years ago
eed50514be
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
6be72a3ec6
Updating Chinese (Simplified) translations ( #5725 )
...
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Change `静音` to `隐藏`
* i18n: (zh-CN) Add translations for #5087 & #5669
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translation for #5728
7 years ago
b28b405b97
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
2151fd3150
Display moderator badge (green), admin badge changed to red ( #5728 )
7 years ago
35fbdc36f9
Merge tootsuite/master at 3023725936
7 years ago
f6bc6399e2
Add Japanese translation for DM block option. ( #5704 )
7 years ago
fbef909c2a
Add option to block direct messages from people you don't follow ( #5669 )
...
* Add option to block direct messages from people you don't follow
Fix #5326
* If the DM responds to a toot by recipient, allow it through
* i18n: Update Polish translation (for #5669 ) (#5673 )
7 years ago
c3ec1e87b8
Updating Chinese (Simplified) translations ( #5643 )
...
* i18n: (zh-CN) Bug fix for note-counter.
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add support.array key for better wording
* Revert "i18n: (zh-CN) Add support.array key for better wording"
This reverts commit 27bf9a946e886213e827cd985d4f62419db57534.
Looks like this commit can't get pass the checks, revert it for now.
* i18n: (zh-CN) Change `客户端` to `应用`
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translations (#5635 )
* i18n: (zh-CN) Change `两步验证` to `双重认证`
* i18n: (zh-CN) Improve translations
7 years ago
8087aa83d4
i18n: Update Polish translation ( #5699 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
249b0fe107
Add Japanese translations for moderator roles and its own admin actions. ( #5689 )
7 years ago
a6682a3000
i18n: fix typo in Polish translation ( #5688 )
7 years ago
0e6c4cb796
l10n: PT-BR translation updated ( #5681 )
...
* Improved e-mail messages; delted repeated words
* pt-BR.json translations updated
* Revert "pt-BR.json translations updated"
This reverts commit 108c460531196fed6e6d14f93e8d8d047c835ffd.
* Updated pt-BR.json
* pt-BR.yml updated
7 years ago
252d0fe020
Fix #5652 - Notify too short when abbrev in JA ( #5664 )
...
* Fix #5652 - Notify too short when abbrev in JA
Fix #5652 of the notification message to be understandable when abbreviated.
* Changed quotes as original
Double quote to single and single quote as none. But I am not convinced of this fix.
* Added a single quote as YAMLlint's suggestion
* `bundle exec i18n-tasks normalize`
7 years ago
fcb9533549
i18n: Update Polish translation (for #5635 ) ( #5661 )
...
* i18n: Update Polish translation (for #5635 )
* 😑 🔫
7 years ago
7bb8b0b2fc
Add moderator role and add pundit policies for admin actions ( #5635 )
...
* Add moderator role and add pundit policies for admin actions
* Add rake task for turning user into mod and revoking it again
* Fix handling of unauthorized exception
* Deliver new report e-mails to staff, not just admins
* Add promote/demote to admin UI, hide some actions conditionally
* Fix unused i18n
7 years ago
e5aa4128f6
Update en.yml ( #5648 )
...
Changed "Toots with replies" to read "Toots and replies"
7 years ago
cfd7b7a0b7
i18n: Update Polish translation ( #5639 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
36376b5e23
Translate ja ( #5637 )
7 years ago
eb97bd8af6
i10n OC: Memorial ( #5615 ) + #5467 ( #5623 )
...
* Changed ĩ => ï
* Changed ĩ => ï
* Add ability to disable login and mark accounts as memorial (#5615 )
7 years ago
1032f3994f
Add ability to disable login and mark accounts as memorial ( #5615 )
...
Fix #5597
7 years ago
b6e2e999bd
Show the local couterpart of emoji when it exists in /admin/custom_emojis ( #5467 )
...
* Show the local couterpart of emoji when it exists in admin/custom_emojis
* Fix indentation
* Fix error
* Add class table-action-link to Overwrite link
* Make it enable to overwrite emojis
* Make Code Climate happy
7 years ago
d48779cf7b
i18n: Improve Polish translation ( #5596 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
da3adc0a73
l10n Occitan ( #5586 )
...
* Update OC: time format
Correction for time format according to: https://opinion.jornalet.com/conselh-linguistic-de-jornalet/blog/2379/la-notacion-oraria-en-occitan
Harmonisation words in menu and confirmation windows
* Update for unlisted custum emoji + #5577
* correction subjonctiu
It's either siasque or siague
* Corrections
Any : qual que, in two words, else it means "some".
And "siasque" with S even if I don't pronounce it at all.
* Update oc.json
7 years ago
38d072446b
add account search condition (instance domain) ( #5577 )
7 years ago
29609fbb6a
Updating Chinese (Simplified) translations ( #5508 )
...
* i18n: (zh-CN) fix punctuations and spaces
Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines
* i18n: (zh-CN) fix punctuation
* i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes
https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677
* i18n: (zh-CN) Update missing translations
* i18n: (zh-CN) Fixing errors
* i18n: (zh-CN) Fix indent error
* i18n: (zh-CN) Fix language tag
* i18n: (zh-CN) Remove quotes
* i18n: (zh-CN) Update translation (#5485 )
* i18n: (zh-CN) Remove whitespaces, x -> ×
* i18n: (zh-CN) Rewording on time distance
* i18n: (zh-CN) Overall improvements
* i18n: (zh-CN) i18n-tasks normalization
* i18n: (zh-CN) Add missing translation
7 years ago
4080569c2d
Fix a grammatical error in the notifications. ( #5555 )
7 years ago
2cbb8e8cd1
i18n: Update Polish translation ( #5547 )
7 years ago
870d71b78b
Merge branch 'master' into gs-master
7 years ago
781105293c
Feature: Unlisted custom emojis ( #5485 )
7 years ago
a2612d0d38
Merge pull request #179 from glitch-soc/keyword-mute
...
Keyword muting
7 years ago
20fee786b1
Update Russian translation ( #5517 )
...
* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
* Update Russian translation
* Arrange Russian setting alphabetically
* Fix syntax error
* Update Russian translation
* Fix formatting error
* Update Russian translation
* Update Russian translation
* Update ru.jsx
* Fix syntax error
* Remove two_factor_auth.warning (appears obsolete)
* Add missing strings in ru.yml
A lot of new strings translated, especially for the newly added admin section
* Fix translation consistency
* Update Russian translation
* Update Russian translation (pluralizations)
* Update Russian translation
* Update Russian translation
* Update Russian translation (pin)
* Update Russian translation (account deletion)
* Fix extra line
* Update Russian translation (sessions)
* Update Russian translation
* Update Russian translation
* Fix merge conflicts (revert)
* Update Russian translation
* Update Russian translation (fix)
* Update Russian translation (fix quotes)
* Update Russian translation (fix quotes)
* Update Russian translation (fix)
* Update Russian translation
* Add quotes
* bundle exec i18n-tasks normalize
7 years ago
74777599cf
l10n: PT-BR translation updated ( #5530 )
7 years ago
1a60445a5f
Address unused translation errors.
7 years ago
cd04e3df58
Fill in create, edit, update, and destroy for keyword mutes interface.
...
Also add a destroy-all action, which can be useful if you're flushing an
old list entirely to start a new one.
7 years ago
2e03a10059
Spike out index and new views for keyword mutes controller.
7 years ago
4fa2f7e82d
Set up /settings/keyword_mutes. #164 .
...
This should eventually be accessible via the API and the web frontend,
but I find it easier to set up an editing interface using Rails
templates and the like. We can always take it out if it turns out we
don't need it.
7 years ago
c710069c12
Some typos and supplementation in sentence structures ( #5441 )
...
* Swedish file added
* Swedish file added
* Swedish file updated
* Swedish languagefile added
* Add Swedish translation
* Add Swedish translation
* Started the Swedish translation
* Added Swedish lang settings
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Swedish language completed and added
* Swedish language Simple_form added
* Swedish language Divise added
* Swedish language doorkeeper added
* Swedish language - now all file complete
* Swedish - Typos and supplementation in sentence structure
* Update simple_form.sv.yml
* Update sv.yml
* Update sv.yml
Rearranged the alphabetical order.
7 years ago
363d0d3a44
Dutch: A few strings I found last minute ( #5440 )
...
* Dutch: A few strings I found last minute
* Update simple_form.nl.yml
7 years ago
33ea042dec
i18n better wording (OC/CA/FR) + string added in FR ( #5438 )
...
* Update oc.json
* Update fr.json
* Update ca.json
* Update fr.json
* Update simple_form.fr.yml
* Update ca.json
* Update fr.json
* Update oc.json
* Update oc.json
* Update fr.json
7 years ago
e6c9756fa9
Update German translation ( #5425 )
7 years ago
5050719fac
Add Japanese translations ( #5427 )
...
* yarn manage:translations
* Add Japanese translation for #5410
* Add Japanese translation for #5393
7 years ago
989553c69a
Normalize locale files ( #5429 )
7 years ago
a2b600428c
Swedish translation ( #5406 )
...
* Swedish file added
* Swedish file added
* Swedish file updated
* Swedish languagefile added
* Add Swedish translation
* Add Swedish translation
* Started the Swedish translation
* Added Swedish lang settings
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Swedish language completed and added
* Swedish language Simple_form added
* Swedish language Divise added
* Swedish language doorkeeper added
* Swedish language - now all file complete
7 years ago
df1a9c5ab5
Small update Dutch (nl) strings ( #5424 )
...
* Update Dutch strings
* Update Dutch
7 years ago
3c530d95f6
i18n: Update Polish translation ( #5416 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
1e7b3bf625
i18n ultim hour «More» dropdown title + reduce motion ( #5415 )
...
* Correction fem. form
* More dropdown title
* More dropdown title
* More dropdown title
* Add option to reduce motion (#5393 )
7 years ago
fa0be3f834
Add option to reduce motion ( #5393 )
...
* Add option to reduce motion
* Use HOC to wrap all Motion calls
* fix case-sensitive issue
* Avoid updating too frequently
* Get rid of unnecessary change to _simple_status.html.haml
7 years ago
3e2f793948
Add up-to-date korean translation on serverside ( #5400 )
...
* chore: add korean translation on ko.yml
* feat: add simple form korean translation up-to-date
7 years ago
8eb7d30a6c
l10n Occitan: finishing touches ( #5404 )
...
* Update oc.json
* Update oc.yml
7 years ago
7fe1428cc4
Update French translation ( #5401 )
7 years ago
f63a40e7c2
Updated Catalan strings ( #5323 )
...
* Add Catalan language
* Add Catalan language
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update settings_helper.rb
* Update mastodon.js
* Update index.js
* Update application.rb
* Update ca.yml
* removed extra spaces at line 225
* Catalan translation update
added activerecord.ca.yml
* Update activerecord.ca.yml
Done
* Updated activerecord.ca.yml
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Update ca.json
Removed :
<<<<<<< HEAD
"getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master
* Syncing to master
* Added new Catalan strings
* removed config.secret_key line
* Corrected <sotrong> tag to <strong>
Line 515
* Removed extra line
* Reverted
* yarn.lock reverted
* Updated Catalan strings
* Updated Catalan strings
7 years ago
c6f76db2e1
Update French translation ( #5384 )
...
Update French translation
7 years ago
2c704ca9c6
l10n: update Persian translation for 2.0 ( #5391 )
7 years ago
c1a2707ecf
Correct some misspellings ( #5381 )
...
* Correct some misspellings
Remove some english language and put the proper french words in place.
* Forgot some shit
Buurps'
7 years ago
NCLS
Jenkins
Marcin Mikołajczak
SerCom_KC
kibigo!
David Yip
mayaeh
Yamagishi Kazutoshi
nullkal
Eugen Rochko
spla
Joan Montané
Lynx Kotoura
Surinna Curtis
Anna e só
KEINOS
Matt
Quenty31
MitarashiDango
Alda Marteau-Hardi
beatrix
Ratmir Karabut
Anna e só
Håkan Eriksson
Jeroen
JeanGauthier
Jakob Kramer
Nolan Lawson
voidSatisfaction
Yannick A
Masoud Abkenar
Mathias B