about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
2017-08-12Minor fixes in the French translation (#4580)Sylvhem
* 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".
2017-08-10l10n Update OC #4521 (#4577)Quent-in
* l10n Update OC #4521 Link => token provider => provesidor + more generalized way of using present participle * Update oc.yml
2017-08-10Added new catalan strings (#4574)spla
* 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
2017-08-09i18n: Improve admin panel translation (pl) (#4559)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-08-08Add ActivityPub inbox (#4216)Eugen Rochko
* Add ActivityPub inbox * Handle ActivityPub deletes * Handle ActivityPub creates * Handle ActivityPub announces * Stubs for handling all activities that need to be handled * Add ActivityPub actor resolving * Handle conversation URI passing in ActivityPub * Handle content language in ActivityPub * Send accept header when fetching actor, handle JSON parse errors * Test for ActivityPub::FetchRemoteAccountService * Handle public key and icon/image when embedded/as array/as resolvable URI * Implement ActivityPub::FetchRemoteStatusService * Add stubs for more interactions * Undo activities implemented * Handle out of order activities * Hook up ActivityPub to ResolveRemoteAccountService, handle Update Account activities * Add fragment IDs to all transient activity serializers * Add tests and fixes * Add stubs for missing tests * Add more tests * Add more tests
2017-08-08Add Content-Type header on throttled response to fix mojibake (#4558)unarist
application/json only allows Unicode, so this prevents from wrong charset detection.
2017-08-07Merge remote-tracking branch 'upstream/master'Ondřej Hruška
2017-08-08It makes no sense to try using invalid or expired link again (#4521)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-08-07i18n: Update Polish translation (#4545)m4sk1n
2017-08-06i18n: update Persian translation (#4540)Masoud Abkenar
2017-08-06Fix #4531 (#4533)Komic
wrong character, sorry about that~
2017-08-06fr.yml update (#4531)Komic
Translation for https://github.com/tootsuite/mastodon/pull/4523
2017-08-06Translate 'Signed in as' into Japanese (#4530)Daigo 3 Dango
2017-08-06l10n OC - Added #4523 "signed in as" (#4529)Quent-in
Neutral form used.
2017-08-05Add "signed in as" header to some pages (#4523)Eugen Rochko
2017-08-05l10n update Occitan (#4522)Quent-in
Salutation mailer + invalid reset link.
2017-08-04Fix some mistakes in Polish translation (#4495)Krzysztof Jurewicz
2017-08-04Ignore some locale keys that can but do not need to be translated (#4515)Eugen Rochko
2017-08-04Dutch strings: typo (#4489)Jeroen
2017-08-03i18n: Update Polish translation (#4479)m4sk1n
* i18n: Update Polish translation * Update Polish translation
2017-08-03Enable cache for babel-loader (#4505)Yamagishi Kazutoshi
2017-08-03Redirect to PasswordController#new when reset_password_token is invalid (#4506)nullkal
2017-08-02Update Japanese Translation (authorize_follow) (#4481)asria-jp
* Update Japanese Translation * preserve "Unfortunately"("残念ながら") preserve "Unfortunately"("残念ながら")
2017-08-01Merge upstream (#111)kibigo!
2017-07-31i18n: update Persian translation (#4470)Masoud Abkenar
* i18n: update Persian translation * i18n: fix quotes
2017-07-31Make salutation of email localizable (#4454)unarist
2017-07-30Multiple frontend support (#110)Gô Shoemake
* Initial multiple frontend support * Removed unnecessary require() * Moved styles/images out of common
2017-07-30Update Japanese translations (#4453)unarist
2017-07-29Dutch: Small fix (#4441)Jeroen
2017-07-29i18n update of OC version (#4425)Quent-in
* Correction of misspellings * Improve the OC version * Improve of the OC version * Improvement of OC version
2017-07-28i18n: Update Polish translation (#4414)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-28Remove hash from chunk filename when dev env (#4411)Yamagishi Kazutoshi
2017-07-28feat(web_push_notifications): Group notifications (#4388)Sorin Davidoi
2017-07-28Fix #3189 - Share CSRF secret between main app and Sidekiq Web (#4383)Eugen Rochko
2017-07-28fix #4356 : place sw.js to assets/sw.js (#4357)Satoshi KOJIMA
2017-07-28Update Russian translation (#4407)Ratmir Karabut
* 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
2017-07-27Add default settings for user (#4393)Yamagishi Kazutoshi
2017-07-26s/PubSubHubbub/WebSub/g (#4372)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-25Merge git://github.com/tootsuite/mastodon into tootsuite-masterOndřej Hruška
2017-07-25Update Japanese translations for landing page (for Mobile). (#4362)Clworld
2017-07-25Update and (almost) completing Dutch strings for 1.5 (#4351)Jeroen
* Update and expanding Dutch strings for 1.5 Only privacy policy is not translated, but is included. Hopefully I have time to translate this another time (you can set your own privacy policy now anyway). * Missing file * A few changes cause of changes in another file * Fix * Update Dutch strings for 1.5 * nl * fix don't know how that ended up there * Update nl.yml
2017-07-25Update Capistrano lock version in config/deploy.rb (#4352)Petko Bordjukov
Deployment with Capistrano was failing due to a mismatch between the loaded version of Capistrano and the one specified in the deployment configuration. Bumping the version in config/deploy.rb fixes this issue.
2017-07-24i18n: @2374d63 (pl) (#4340)m4sk1n
* i18n: @2374d63 (pl) * i18n: fixed typo on Polish translation
2017-07-24Redesign /terms page (#4338)Eugen Rochko
* Redesign /terms page * Fix tests * Remove unused keys
2017-07-24Move clean up of unconfirmed users to sidekiq-scheduler (#4336)Eugen Rochko
* Move clean up of unconfirmed users to sidekiq-scheduler * mastodon:daily is now deprecated
2017-07-24Redesign extended information page (#4322)Eugen Rochko
* Redesign extended information page * Remove unused keys * Add $ui-base-lighter-color variable to SCSS
2017-07-24Run i18n-tasks normalize (#4335)Eugen Rochko
2017-07-24Allow domain blocks that only reject media without silencing or suspending ↵sdukhovni
(#4325) * Allow domain blocks to reject media without silencing or suspending * Fix typo * Hide 'Reject media' button when superfluous, instead of disabling it * Properly hide 'reject media' checkbox on page load if needed This may happen when resubmitting the domain block form after an error. * Don't ask whether undoing a media-only block should be retroactive * Rename :media_only block to :noop * Display :noop block as None in frontend, allow blocks that do nothing * Remove 'coding' line auto-added by emacs
2017-07-24Redirect user profile page to short URL when HTML format (#4328)Yamagishi Kazutoshi
2017-07-23i18n: Update Polish translation (#4327)m4sk1n
* i18n: Update Polish translation * i18n: Update Polish translation
generated by cgit-pink (git 2.37.1) at 2024-11-06 06:15:19 +0000