treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
4,407 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

576 Commits (c102025e2cfa7e5c6f43c4d8019c64cf9e26fb5c)

Author SHA1 Message Date
JeanGauthier c102025e2c 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)
 2017-10-16 14:09:26 +02:00
Nolan Lawson a54c272a1f 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
 2017-10-16 09:36:15 +02:00
voidSatisfaction 23dad325da 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
 2017-10-15 23:08:30 +02:00
JeanGauthier 2b099f9f2e l10n Occitan: finishing touches (#5404) 
* Update oc.json

* Update oc.yml
 2017-10-15 23:07:32 +02:00
Yannick A c03e2d7c51 Update French translation (#5401) 2017-10-15 21:21:05 +09:00
spla 9fc9d3554d 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
 2017-10-14 14:40:35 +02:00
Yannick A 7b717319f6 Update French translation (#5384) 
Update French translation
 2017-10-14 14:30:19 +02:00
Masoud Abkenar 5c26c3062d l10n: update Persian translation for 2.0 (#5391) 2017-10-14 14:28:19 +02:00
Mathias B 1df10e26a8 Correct some misspellings (#5381) 
* Correct some misspellings 

Remove some english language and put the proper french words in place.

* Forgot some shit

Buurps'
 2017-10-14 03:34:59 +02:00
Anna e só 02d14fd373 l10n: PT-BR translation updated (#5362) 
* PT-BR translation updated

* Testing

* Indentation error fixed

* More indentation errors fixed
 2017-10-13 06:16:43 +09:00
Jeroen 682bf2d624 Updating more Dutch strings for 2.0 (#5359) 2017-10-12 21:33:37 +02:00
Alda Marteau-Hardi dfde574160 Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350) 2017-10-12 16:31:14 +02:00
JohnD28 77cd62882b 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.
 2017-10-12 15:25:34 +02:00
Marcin Mikołajczak b9eb3c264b i18n: Update Polish translation (#5346) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-10-12 16:56:03 +09:00
JeanGauthier 60152a421a Moderation notes (#5344) 2017-10-12 15:28:15 +09:00
nullkal 38e5d51b42 Update ja.yml (#5342) 
* Update ja.yml

* Update simple_form.ja.yml
 2017-10-12 12:18:13 +09:00
Sylvhem ad4d5aaf96 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.
 2017-10-12 00:58:01 +02:00
JohnD28 c66403114c Update doorkeeper.fr.yml (#5317) 2017-10-11 22:04:36 +09:00
Jakob Kramer d24ea1df74 Update German translation (#5302) 2017-10-10 23:12:18 +09:00
m4sk1n d9e51960a2 i18n: Update Polish translation (#5270) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-10-08 16:00:55 +09:00
Jeong Arm 094616ad3f Translate some Esperanto (#5252) 
* Translate some Esperanto

* More translation

* More Esperanto translation

* Esperanto translation

* Fix mistaken format
 2017-10-08 14:30:14 +09:00
JeanGauthier 5bff1ad44e i18n update Occitan (#5263) 
* Update oc.json

* Update oc.yml

* Update oc.yml

* Update oc.json
 2017-10-08 14:18:27 +09:00
nullkal 81489970fb Add moderation note (#5240) 
* Add moderation note

* Add frozen_string_literal

* Make rspec pass
 2017-10-07 20:26:43 +02:00
Eugen Rochko b98cd0041b Redesign public hashtag pages (#5237) 2017-10-07 20:00:35 +02:00
Jeong Arm 9ea15ab021 Korean translation (#5244) 
* [i18n] Korean translation

Add missing Korean translations.

[skip ci]

* start ci
 2017-10-07 14:16:59 +09:00
m4sk1n 84780cbd96 i18n: Update Polish translation (#5255) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-10-06 22:43:32 +02:00
Eugen Rochko b4af50c521 Improve admin UI for custom emojis, add copy/disable/enable (#5231) 2017-10-05 23:42:05 +02:00
Jakob Kramer 53105c4210 Update German translation (#5221) 2017-10-04 20:03:41 +02:00
utam0k 51f8cbfbeb 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
 2017-10-04 15:16:10 +02:00
Yamagishi Kazutoshi 6bd4e3bf97 Separate notifications preferences from general preferences (#4447) 
* Separate notifications preferences from general preferences

* Refine settings/notifications/show

* remove preferences.notifications
 2017-10-04 10:22:52 +02:00
Yamagishi Kazutoshi f7d7a92d57 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

* "項目" -> "絵文字"
 2017-10-03 13:10:26 +02:00
Jakob Kramer 902e249cdb Update German translation (#5189) 2017-10-03 09:53:18 +09:00
m4sk1n 17bcb30c82 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>
 2017-10-02 23:38:40 +02:00
Jeong Arm ee21576c19 Korean translation (#5185) 
* Add missing Korean translations

* Add Korean email confirmation template

* Fix Korean typo
 2017-10-02 23:26:28 +02:00
JeanGauthier 941a1532f2 l10n Update OC: reorganization pref. page (#5168) 2017-10-01 19:09:45 +02:00
Eugen Rochko 06ef1b0ac4 Reorganize preferences page (#5161) 2017-10-01 10:52:39 +02:00
roikale 4f18c27c43 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
 2017-09-30 16:25:14 +02:00
Jakob Kramer 6f2a885ea3 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.
 2017-09-29 21:11:28 +02:00
Yanaken e65378e808 Better Japanese translations (#5142) 2017-09-29 13:27:31 +09:00
Jakob Kramer d55a6ae28a Update German translation (#5133) 
Create activerecord.de.yml (50%)
Update devise.de.yml
Update doorkeeper.de.yml (100%)
Update simple_form.de.yml (100%)
 2017-09-28 20:45:09 +02:00
JeanGauthier 0f0791c563 OC 500 error (#5110) 2017-09-28 20:22:34 +02:00
m4sk1n 7291f1de08 i18n: Update Polish translation (#5106) 
* i18n: Update Polish translation

* i18n: Update Polish translation
 2017-09-26 14:19:25 +09:00
Eugen Rochko 1767f9817c 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
 2017-09-25 23:05:54 +02:00
Eugen Rochko 6b0ea1e79c Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067) 2017-09-25 04:04:04 +02:00
Lynx Kotoura 88fd9f47fd Fix theme translations alphabetically (#5031) 2017-09-20 19:41:35 +02:00
Lynx Kotoura 42bacb1e30 Better Japanese translations (#5030) 2017-09-21 01:56:28 +09:00
mayaeh 0e9e5e0317 Add Japanese translations for multiple themes, custom emoji (#5026) 
* Add Japanese translations for multiple themes

* Change Japanese translation for custom emoji's created_msg.
 2017-09-20 16:09:57 +02:00
JeanGauthier acfb7a463e 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
 2017-09-20 15:00:54 +02:00
mayaeh d8a459820c Add japanese translations for custom emoji. (#5007) 
* Add japanese translations for custom emoji.

* Remove spaces.

* Change destroyed_msg.

* Revert "Change destroyed_msg."
 2017-09-20 14:57:59 +02:00
m4sk1n 816175a1fb i18n: Update Polish translation (#5015) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-09-19 23:25:17 +02:00