635 Commits (d68868ca14d92b8a9a94cf8412c8aca570b566d4)

Author	SHA1	Message	Date
Håkan Eriksson	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
Jeroen	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
JeanGauthier	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
Jakob Kramer	e6c9756fa9	Update German translation (#5425)	7 years ago
Yamagishi Kazutoshi	5050719fac	Add Japanese translations (#5427) ... * yarn manage:translations * Add Japanese translation for #5410 * Add Japanese translation for #5393	7 years ago
Yamagishi Kazutoshi	989553c69a	Normalize locale files (#5429)	7 years ago
Håkan Eriksson	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
Jeroen	df1a9c5ab5	Small update Dutch (nl) strings (#5424) ... * Update Dutch strings * Update Dutch	7 years ago
Marcin Mikołajczak	3c530d95f6	i18n: Update Polish translation (#5416) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
JeanGauthier	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
Nolan Lawson	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
voidSatisfaction	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
JeanGauthier	8eb7d30a6c	l10n Occitan: finishing touches (#5404) ... * Update oc.json * Update oc.yml	7 years ago
Yannick A	7fe1428cc4	Update French translation (#5401)	7 years ago
spla	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
Yannick A	c6f76db2e1	Update French translation (#5384) ... Update French translation	7 years ago
Masoud Abkenar	2c704ca9c6	l10n: update Persian translation for 2.0 (#5391)	7 years ago
Mathias B	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
Anna e só	ad917cda10	l10n: PT-BR translation updated (#5362) ... * PT-BR translation updated * Testing * Indentation error fixed * More indentation errors fixed	7 years ago
Jeroen	f398ad1994	Updating more Dutch strings for 2.0 (#5359)	7 years ago
Alda Marteau-Hardi	3cfcc7a50e	Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)	7 years ago
JohnD28	691e9112f3	Update fr.yml (#5330) ... * Update fr.yml Update of french translation and reformatting Privacy Policy for better maintenance. * Update fr.yml * Update fr.yml * Update fr.yml Corrections suivant les remarques d'Alda. * Update fr.yml * Update fr.yml * Update fr.yml * Update fr.yml * Update fr.yml I have replaced my proposals with those accepted here to reduce the conflict. https://github.com/tootsuite/mastodon/pull/5340 J'ai remplacé mes propositions par celles acceptées ici pour réduire le conflit. Comment dois-je faire à l'avenir pour éviter ce genre de situations ? * Update fr.yml Conflict reduction.	7 years ago
Marcin Mikołajczak	9d84b6e606	i18n: Update Polish translation (#5346) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
JeanGauthier	bf0f7e8846	Moderation notes (#5344)	7 years ago
nullkal	4817744b87	Update ja.yml (#5342) ... * Update ja.yml * Update simple_form.ja.yml	7 years ago
Sylvhem	3ebe03b729	Fixes and updates for the French translation (#5340) ... * Ajout du support des thèmes multiples Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples. Add translations for the new strings allowing support for multiple themes. * Mise à jour de la traduction Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas. Update modified strings and add new translations for the ones who are missing them. * Remplace « ' » par « ’ » Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019). En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux. Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019). In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.	7 years ago
JohnD28	fe6941e28e	Update doorkeeper.fr.yml (#5317)	7 years ago
Jakob Kramer	616f53eea8	Update German translation (#5302)	7 years ago
m4sk1n	f0c939c431	i18n: Update Polish translation (#5270) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Jeong Arm	ebadfe0ab7	Translate some Esperanto (#5252) ... * Translate some Esperanto * More translation * More Esperanto translation * Esperanto translation * Fix mistaken format	7 years ago
JeanGauthier	94f15338c3	i18n update Occitan (#5263) ... * Update oc.json * Update oc.yml * Update oc.yml * Update oc.json	7 years ago
nullkal	633426b261	Add moderation note (#5240) ... * Add moderation note * Add frozen_string_literal * Make rspec pass	7 years ago
Eugen Rochko	f486ef2666	Redesign public hashtag pages (#5237)	7 years ago
Jeong Arm	0e0a9e716c	Korean translation (#5244) ... * [i18n] Korean translation Add missing Korean translations. [skip ci] * start ci	7 years ago
m4sk1n	4413d81d7f	i18n: Update Polish translation (#5255) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Eugen Rochko	49cc0eb3e7	Improve admin UI for custom emojis, add copy/disable/enable (#5231)	7 years ago
Jakob Kramer	636acb5712	Update German translation (#5221)	7 years ago
utam0k	b3af3f9f8c	Implement EmailBlackList (#5109) ... * Implement BlacklistedEmailDomain * Use Faker::Internet.domain_name * Remove note column * Add frozen_string_literal comment * Delete unnecessary codes * Sort alphabetically * Change of wording * Rename BlacklistedEmailDomain to EmailDomainBlock	7 years ago
Yamagishi Kazutoshi	178f718a9b	Separate notifications preferences from general preferences (#4447) ... * Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications	7 years ago
Yamagishi Kazutoshi	eb6ec3d068	Add missing Japanese translations (#5193) ... * yarn manage:translations * Add Japanese translations for #5170 * Add Japanese translations for #5123 * Add Japanese translations for #5046 * Add Japanese translations for #5099 * Add Japanese translations for #5161 * "項目" -> "絵文字"	7 years ago
Jakob Kramer	395a57d03d	Update German translation (#5189)	7 years ago
m4sk1n	a767ef85fa	i18n: Update translation files and Polish translation (#5180) ... * Update translation files Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Jeong Arm	c30e492587	Korean translation (#5185) ... * Add missing Korean translations * Add Korean email confirmation template * Fix Korean typo	7 years ago
JeanGauthier	04fa4eb7f9	l10n Update OC: reorganization pref. page (#5168)	7 years ago
Eugen Rochko	0b3f1ec62a	Reorganize preferences page (#5161)	7 years ago
roikale	1df453aff6	Change wording on landing page. (#4805) ... "Ilmainen" means "gratis", but Mastodon is free as in freedom, libre – "vapaa". https://fi.wikipedia.org/wiki/Vapaa_ohjelmisto	7 years ago
Jakob Kramer	1a72813b53	Updated German translation (#5151) ... Translate "about" page, several settings pages, data export/import, sessions overview, authorized followers page, account deletion page. More consistent use of words: - A toot is a Beitrag. - An account is a Konto. Some small improvements.	7 years ago
Yanaken	c3f9c74719	Better Japanese translations (#5142)	7 years ago
Jakob Kramer	d0b4709b2a	Update German translation (#5133) ... Create activerecord.de.yml (50%) Update devise.de.yml Update doorkeeper.de.yml (100%) Update simple_form.de.yml (100%)	7 years ago
JeanGauthier	3406e30526	OC 500 error (#5110)	7 years ago
m4sk1n	9d53a38a44	i18n: Update Polish translation (#5106) ... * i18n: Update Polish translation * i18n: Update Polish translation	7 years ago
Eugen Rochko	3b60832214	New error page graphic. Other error page improvements (#5099) ... - 500.html generated with admin-set default locale if set - Error page `<title>` includes Mastodon site title - 500 title changed to "This page is not correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>) - 500 content appended with "on our end" to make clear it's not user's fault	7 years ago
Eugen Rochko	2c8e3fbbfb	Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)	7 years ago
Lynx Kotoura	8fcfcddc8f	Fix theme translations alphabetically (#5031)	7 years ago
Lynx Kotoura	f41e70ca38	Better Japanese translations (#5030)	7 years ago
mayaeh	7b8ecde32d	Add Japanese translations for multiple themes, custom emoji (#5026) ... * Add Japanese translations for multiple themes * Change Japanese translation for custom emoji's created_msg.	7 years ago
JeanGauthier	1607bb445a	l10n Occitan: theme site, custom emoji, Oauth, newcomers follow admins, ... (#5023) ... * Oauto code string * Theme, custom emoji and more * Site theme * added two spaces wierdly gone away * Update oc.yml Changes adviced	7 years ago
mayaeh	33c39784e4	Add japanese translations for custom emoji. (#5007) ... * Add japanese translations for custom emoji. * Remove spaces. * Change destroyed_msg. * Revert "Change destroyed_msg."	7 years ago
m4sk1n	1de6c52545	i18n: Update Polish translation (#5015) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Andrew	0401a24558	Add support for multiple themes (#4959) ... * Add support for selecting a theme * Fix codeclimate issues * Look up site default style if current user is not available due to e.g. not being logged in * Remove outdated comment in common.js * Address requested changes in themes PR * Fix codeclimate issues * Explicitly check current_account in application controller and only check theme availability if non-nil * codeclimate * explicit precedence with && * Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml * codeclimate: indentation + return	7 years ago
Eugen Rochko	09a94b575e	Admin interface for listing, adding and removing custom emojis (#5002) ... * Admin interface for listing, adding and removing custom emojis * Only display local ones in the list	7 years ago
Eugen Rochko	d43944143a	Run i18n-tasks normalize (#5003)	7 years ago
BruWalfas	c155d843f4	A few updates to the Spanish translation and some typos fixing (#4997) ... * So Spanish. Much changes. Wow. * Some little fixes * Updated es.yml, and fixed some ortographical errors * Some little changes to simple_form.es.yml * Yeah, so much translations * Spanish e-mail messages * Remove unused message	7 years ago
Lynx Kotoura	4c14ff659b	Oauth code in input form and add description message (#4986) ... * Oauth code in a input form and add description * New authcode description	8 years ago
Mingye Wang	c8969dca35	Minor Chinese check & jsx addition (#4973) ... * zh-*: transition from "like" back to "fav" This commit reverts the translation for the yellow-star "fav" button back to "fav" in Chinese. Some ambuiguity between "like" and "fav" is deliberately used in zh-TW/HK by using the existing phrase "最爱" (favorite (adj.), lit. love-most) instead of "收藏" (favourite (v.), "collect") in some instances. Fixes #3511. * zh-*: apply suggestions for PR #4557 * zh-cn: de-monetize ya account In Chinese two separate characters, 账 and 帐, can be used to spell the word for account (账/帐户). However, the one with a 贝 on the left is evolved from the latter specifically for monetary purposes. Since people usually can't figure out which one to use, it might be a good idea to use the original not-so-money one. * zh-*: complete jsx translation	8 years ago
Anna e só	e77cc032c2	l10n: PT-BR translation updated (#4953) ... * devise.pt-BR.yml now fully translated * pt-BR.json now fully translated * pt-BR.yml partially translated; 46 lines left * pt-BR.yml now fully translated * simple_form.pt-BR.yml fully translated * doorkeeper.pt-BR.yml now fully translated * E-mail instructions on app/views/user_mailer added and fully translated * PT-BR translation for #4871 * Deleted an unwanted caracter on pt-BR.yml * Fixing typos on pt-BR.yml * Added translation for Pinned toots tab on pt-BR.json * Added missing translation for navigation_bar.pins * Fixed spelling on pt-BR.yml * Update pt-BR.json	8 years ago
Yamagishi Kazutoshi	bdcc9e2ceb	Add missing Japanese translations (#4947)	8 years ago
Masoud Abkenar	b39d512ade	l10n: update Persian translation (#4946)	8 years ago
m4sk1n	94fba44eec	i18n: Update Polish translation (#4942) ... * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update pl.yml	8 years ago
Jeroen	721460a59b	Another Dutch language update (#4944) ... * Update nl.json * Update nl.yml * Update nl.json	8 years ago
Quent-in	aad3df6afc	l10n update OC/FR video redesign (#4938) ... * l10n update for Redesign video player (#4911) * Update videp * Update I hope this time format works well. * One missing string * Update time format I'd like the complete name of the month in the Long format and the short one in the short format. I hope it works now	8 years ago
N氏	1023f52eaa	Add Japanese translate for #4913 (#4936)	8 years ago
Eugen Rochko	9239e4ce4d	Uploads for admin site settings (#4913) ... * Improve OpenGraph tags for about pages * Add thumbnail admin setting * Fix error * Fix up	8 years ago
m4sk1n	06f26e09b4	i18n: Update Polish translation (#4929) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
Jeroen	331263270b	Updating Dutch translation (#4927) ... * Update doorkeeper.nl.yml * Update nl.yml * Update simple_form.nl.yml * Update nl.json * Update en.json * Update en.json * Update nl.json	8 years ago
Eugen Rochko	56af04dbb4	Fix #4918 - Limit pinned toots to 5 (#4923)	8 years ago
unarist	af10c9fbff	Add section for protocol specific information on the admin page (#4910) ... This PR adds section for protocol specific information, then always show both of OStatus and ActivityPub. Specifically, this will help admins to check PuSH subscription status and unsubscribe manually, even `protocol` has been changed. This also includes below changes: * Add `overflow: hidden` to prevent float leaking * Add missing fields for ActivityPub	8 years ago
Anna e só	c2bee07dbc	l10n: Full PT-BR translation (#4882) ... * devise.pt-BR.yml now fully translated * pt-BR.json now fully translated * pt-BR.yml partially translated; 46 lines left * pt-BR.yml now fully translated * simple_form.pt-BR.yml fully translated * doorkeeper.pt-BR.yml now fully translated * E-mail instructions on app/views/user_mailer added and fully translated * PT-BR translation for #4871 * Deleted an unwanted caracter on pt-BR.yml * Fixing typos on pt-BR.yml * Added translation for Pinned toots tab on pt-BR.json * Added missing translation for navigation_bar.pins	8 years ago
Masoud Abkenar	a345479de2	l10n: update Persian translation (#4880) ... * l10n: update Persian translation * l10n: fix missing Persian translation	8 years ago
m4sk1n	08f00df94b	i18n: Update Polish translation (#4881)	8 years ago
yoshipc	15b886a6f0	Fix Japanese translation (#4876) ... I translated the additional text ( added by #4871)	8 years ago
Eugen Rochko	7d7844a47f	Default follows for new users (#4871) ... When a new user confirms their e-mail, bootstrap their home timeline by automatically following a set of accounts. By default, all local admin accounts (that are unlocked). Can be customized by new admin setting (comma-separated usernames, local and unlocked only)	8 years ago
m4sk1n	7c2d84910c	i18n: Update Polish translation (#4845) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
Masoud Abkenar	aec5097d44	i18n: update Persian translation (#4822)	8 years ago
voidSatisfaction	4d67bf18fe	Translation korean added (#4802)	8 years ago
ButterflyOfFire	f09a250a7c	Update ar.yml (#4810) ... Some little changes to "ar" locale	8 years ago
Eugen Rochko	8b12e3cc7f	Fix short number locales (#4790) ... Overwrite values from rails-i18n by manually overwriting in every locale. We want numbers like 1.5K in every language	8 years ago
Andreas Drop	d3f46a77c3	Make german translation more gender neutral #4755 (#4789)	8 years ago
Quent-in	8538170c2d	l10n Occitan update for Embed, cancel follow request, ... (#4788) ... * Update: some missing strings * Updates missing strings * New string * Update oc.json * Update oc.yml * Update oc.json	8 years ago
m4sk1n	2c3544eedd	i18n: Improve Polish translation (#4783) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
Yamagishi Kazutoshi	a0294c8880	Add Japanese translate for #4561 (#4771)	8 years ago
m4sk1n	0b32338e3f	Add link to 'noscript' message (#4561) ... * Add link to 'noscript' message Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * remove indent	8 years ago
Damien Erambert	1a0df58878	Update FR locales (#4714) ... * Make the fr locales up-to-date with the last changes (new profile view, applications) * Use the same wording for toots in fr.yml and fr.json * Translate the pin related strings * Translate pin-related locales on the front-end * Add missing locales in doorkeeper.fr.yml and remove un-used ones * Change "posts" back to "status" in the /about/more page in fr.yml * Fix typos for "status" in fr.yml * fix typo for "status" in fr.json * Remove duplicate string * Non-breaking space before punctuation * 'Better' translation for "unpin" * Put back 'pouet' where it was already * Fix * Fix	8 years ago
Eugen Rochko	74437c6bff	Refactor Web::PushSubscription, remove welcome message (#4524) ... * Refactor Web::PushSubscription, remove welcome message * Add missing helper * Use locale of the receiver on push notifications (#4519) * Remove unused translations * Fix dir on notifications	8 years ago
Lynx Kotoura	8f527bd588	Add japanese translations for shorten display of large numbers (#4722)	8 years ago
Eugen Rochko	15093f9113	Shorten display of large numbers on public profiles (#4711)	8 years ago
mayaeh	f92d991e52	Add japanese translations for Pinned statuses based on pawoo. (#4717) ... Add japanese translations for pin_errors.	8 years ago
Quent-in	04c3fb2189	i18n Updated strings (#4675 - pinned toot) (#4695) ... * Added string for pinned toots * Pinned toot #4675 + missing string Somehow I deleted it "enabled_success" * update after advice	8 years ago
m4sk1n	409051c22c	i18n: Update Polish translation #4675 (#4692) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
Eugen Rochko	9caa90025f	Pinned statuses (#4675) ... * Pinned statuses * yarn manage:translations	8 years ago