595 Commits (cbbeec05be5cd0930a7be73bf673acc8d8105c12)

Author	SHA1	Message	Date
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)	8 years ago
Eugen Rochko	0b3f1ec62a	Reorganize preferences page (#5161)	8 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	8 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.	8 years ago
Yanaken	c3f9c74719	Better Japanese translations (#5142)	8 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%)	8 years ago
JeanGauthier	3406e30526	OC 500 error (#5110)	8 years ago
m4sk1n	9d53a38a44	i18n: Update Polish translation (#5106) ... * i18n: Update Polish translation * i18n: Update Polish translation	8 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	8 years ago
Eugen Rochko	2c8e3fbbfb	Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)	8 years ago
Lynx Kotoura	8fcfcddc8f	Fix theme translations alphabetically (#5031)	8 years ago
Lynx Kotoura	f41e70ca38	Better Japanese translations (#5030)	8 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.	8 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	8 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."	8 years ago
m4sk1n	1de6c52545	i18n: Update Polish translation (#5015) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 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	8 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	8 years ago
Eugen Rochko	d43944143a	Run i18n-tasks normalize (#5003)	8 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	8 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
Quent-in	e4c761f902	l18n update OC new strings (#4664) (#4680) ... * New strings * Update Thin non breaking spaces * Update Thin non breaking spaces * Update Thin non breaking spaces	8 years ago
m4sk1n	829e2e8c5d	Update Polish translation (#4674) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
Yamagishi Kazutoshi	8d23667536	Add Japanese translations for #2758, #4506, #4521, #4600 and #4664 (#4665) ... * Add Japanese translations for #2758, #4506, #4521, #4600 and #4664 * Do not translate Inbox URL and Outbox URL * Remove "あなたの" * Remove "あなたの"	8 years ago
unarist	9846806cb5	Fix Japanese translation (#4669)	8 years ago
Eugen Rochko	c1b086a538	Fix up the applications area (#4664) ... - Section it into "Development" area - Improve UI of application form, index, and details	8 years ago
Colin Mitchell	871c0d251a	Application prefs section (#2758) ... * Add code for creating/managing apps to settings section * Add specs for app changes * Fix controller spec * Fix view file I pasted over by mistake * Add locale strings. Add 'my apps' to nav * Add Client ID/Secret to App page. Add some visual separation * Fix rubocop warnings * Fix embarrassing typo I lost an `end` statement while fixing a merge conflict. * Add code for creating/managing apps to settings section - Add specs for app changes - Add locale strings. Add 'my apps' to nav - Add Client ID/Secret to App page. Add some visual separation - Fix some bugs/warnings * Update to match code standards * Trigger notification * Add warning about not sharing API secrets * Tweak spec a bit * Cleanup fixture creation by using let! * Remove unused key * Add foreign key for application<->user	8 years ago
Yamagishi Kazutoshi	11a7507318	Add delete account link for French (#4659)	8 years ago
m4sk1n	4c23544714	i18n: Minor changes in Polish translation (#4649) ... * i18n: Minor changes in Polish translation * i18n: pl	8 years ago
Quent-in	93d4192a67	l10n update OC : Redesign public profiles (#4608) (#4646) ... New strings added to be shown on the new profile page	8 years ago
Naoki Kosaka	462c30e26c	Update Japanese Translation. (Redesign public profiles) (#4612)	8 years ago
m4sk1n	2a04bdc87a	i18n: Update Polish translation (#4613) ... * i18n: Update Polish translation * Update pl.json	8 years ago
Eugen Rochko	ca7ea1aba9	Redesign public profiles (#4608) ... * Redesign public profiles * Responsive design * Change public profile status filtering defaults and add options - No longer displays private/direct toots even if you are permitted access - By default omits replies - "With replies" option - "Media only" option * Redesign account grid cards * Fix style issues	8 years ago
Quent-in	e33c28a6d8	Update ActivityPub (#4600) (#4609) ... Update: new string + more translations for the time in words	8 years ago
unarist	5b9ae7981e	Update /admin/accounts/:id view for ActivityPub (#4600) ... * Add protocol field * Switch protocol specific information according to active protocol * Hide PuSH subscription related buttons if ActivityPub is active	8 years ago
Sylvhem	d0a217eb92	Minor fixes in the French translation (#4580) ... * Ajout de traductions manquantes Ajoute des traductions pour les chaînes n’en ayant pas en version 1.5.1. Add translations for the strings that are missing them in 1.5.1. * 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. * Ajout d’espaces insécables Ajoute des espaces insécables suivant les régles nécessaires en typographie française. Add non-breaking spaces following rules of French typography. * Remplace « status » par « statut » Remplace le mot anglais « status » par sa traduction française « statut ». Replace the English word "status" by its French translation "statut". * Correction de la politique de confidentialité Apporte diverses corrections à la traduction de la politique de confidentialité. Add various fixes to the privacy policy's translation. * Remplace « mentionné » par « mentionné·e » Harmonise la traduction en remplaçant « mentionné » par sa forme épicène. Harmonize the translation by replacing "mentionné" (sure) by its epicene form. * Remplace « Coup d’œil » par « Jeter un coup d’œil… » Remplace la première traduction par une forme plus proche de la version originelle. Replace the first translation by something closer to the original version. * Remplace « Bon Appétoot ! » par « Bon appouetit ! » Remplace « Bon Appétoot ! » par « Bon appouetit ! » pour essayer de conserver le jeu de mot. Replace « Bon Appétoot ! » by « Bon appouetit ! » to keep the pun. * Remplace « Bon Appétoot ! » par « Bon appouetit ! » (2) Remplace « Bon Appétoot ! » par « Bon appouetit ! » pour essayer de conserver le jeu de mot. Replace « Bon Appétoot ! » by « Bon appouetit ! » to keep the pun.f * Corrections Corrige des fautes d’orthographe et change « appouetit » pour « appouétit ». Correct some mistakes and change "appouetit" to "appouétit".	8 years ago
Quent-in	4b8e4dca26	l10n Update OC #4521 (#4577) ... * l10n Update OC #4521 Link => token provider => provesidor + more generalized way of using present participle * Update oc.yml	8 years ago
spla	10cdad3e7d	Added new catalan strings (#4574) ... * 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	8 years ago
m4sk1n	4e1bf082ce	i18n: Improve admin panel translation (pl) (#4559) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
m4sk1n	47579ec58c	It makes no sense to try using invalid or expired link again (#4521) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
m4sk1n	3363a05539	i18n: Update Polish translation (#4545)	8 years ago
Masoud Abkenar	e7a5a188ef	i18n: update Persian translation (#4540)	8 years ago
Komic	71384b2ef9	Fix #4531 (#4533) ... wrong character, sorry about that~	8 years ago
Komic	d1d465347a	fr.yml update (#4531) ... Translation for https://github.com/tootsuite/mastodon/pull/4523	8 years ago
Daigo 3 Dango	5eba129b0f	Translate 'Signed in as' into Japanese (#4530)	8 years ago
Quent-in	021a83ead4	l10n OC - Added #4523 "signed in as" (#4529) ... Neutral form used.	8 years ago
Eugen Rochko	df605f0f8b	Add "signed in as" header to some pages (#4523)	8 years ago
Quent-in	029786442a	l10n update Occitan (#4522) ... Salutation mailer + invalid reset link.	8 years ago
Krzysztof Jurewicz	400616813e	Fix some mistakes in Polish translation (#4495)	8 years ago
Jeroen	76da330155	Dutch strings: typo (#4489)	8 years ago
m4sk1n	0bbd5789b5	i18n: Update Polish translation (#4479) ... * i18n: Update Polish translation * Update Polish translation	8 years ago
nullkal	dfcd2834f9	Redirect to PasswordController#new when reset_password_token is invalid (#4506)	8 years ago
asria-jp	26ab702304	Update Japanese Translation (authorize_follow) (#4481) ... * Update Japanese Translation * preserve "Unfortunately"("残念ながら") preserve "Unfortunately"("残念ながら")	8 years ago
Masoud Abkenar	4b6cd1dfdb	i18n: update Persian translation (#4470) ... * i18n: update Persian translation * i18n: fix quotes	8 years ago
unarist	155ba8fd3a	Make salutation of email localizable (#4454)	8 years ago
unarist	feadf7553d	Update Japanese translations (#4453)	8 years ago
Jeroen	990cea471e	Dutch: Small fix (#4441)	8 years ago
Quent-in	ff9d344d4c	i18n update of OC version (#4425) ... * Correction of misspellings * Improve the OC version * Improve of the OC version * Improvement of OC version	8 years ago
m4sk1n	c7de92e0df	i18n: Update Polish translation (#4414) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
Sorin Davidoi	e67fc997dc	feat(web_push_notifications): Group notifications (#4388)	8 years ago
Ratmir Karabut	2654f3be82	Update Russian translation (#4407) ... * 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	8 years ago