tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
6,197 Commits 20 Branches 113 Tags
Commit Graph

1386 Commits

Author SHA1 Message Date
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
 2017-10-17 21:49:39 +02:00
Jakob Kramer
e6c9756fa9 Update German translation (#5425) 2017-10-17 12:02:47 +02:00
Yamagishi Kazutoshi
5050719fac Add Japanese translations (#5427) 
* yarn manage:translations

* Add Japanese translation for #5410

* Add Japanese translation for #5393
 2017-10-17 11:47:05 +02:00
Yamagishi Kazutoshi
989553c69a Normalize locale files (#5429) 2017-10-17 11:45:59 +02:00
masarakki
0e0c6b1b4b use-DB_NAME-in-development (#5430) 2017-10-17 11:45:37 +02:00
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
 2017-10-17 13:41:36 +09:00
Jeroen
df1a9c5ab5 Small update Dutch (nl) strings (#5424) 
* Update Dutch strings

* Update Dutch
 2017-10-17 01:00:23 +02:00
David Yip
dbb1fce94d Merge remote-tracking branch 'upstream/master' into gs-master 2017-10-16 09:23:59 -05:00
Marcin Mikołajczak
3c530d95f6 i18n: Update Polish translation (#5416) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-10-16 14:09:51 +02:00
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)
 2017-10-16 14:09:26 +02:00
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
 2017-10-16 09:36:15 +02:00
David Yip
6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master 2017-10-16 01:29:02 -05:00
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
 2017-10-15 23:08:30 +02:00
JeanGauthier
8eb7d30a6c l10n Occitan: finishing touches (#5404) 
* Update oc.json

* Update oc.yml
 2017-10-15 23:07:32 +02:00
Yannick A
7fe1428cc4 Update French translation (#5401) 2017-10-15 21:21:05 +09:00
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
 2017-10-14 14:40:35 +02:00
Yannick A
c6f76db2e1 Update French translation (#5384) 
Update French translation
 2017-10-14 14:30:19 +02:00
Masoud Abkenar
2c704ca9c6 l10n: update Persian translation for 2.0 (#5391) 2017-10-14 14:28:19 +02:00
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'
 2017-10-14 03:34:59 +02:00
Anna e só
ad917cda10 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
f398ad1994 Updating more Dutch strings for 2.0 (#5359) 2017-10-12 21:33:37 +02:00
Alda Marteau-Hardi
3cfcc7a50e Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350) 2017-10-12 16:31:14 +02:00
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.
 2017-10-12 15:25:34 +02:00
David Yip
13e05fece2 Merge tag 'v2.0.0rc2' into gs-master 2017-10-12 04:22:59 -05:00
Marcin Mikołajczak
9d84b6e606 i18n: Update Polish translation (#5346) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-10-12 16:56:03 +09:00
JeanGauthier
bf0f7e8846 Moderation notes (#5344) 2017-10-12 15:28:15 +09:00
nullkal
4817744b87 Update ja.yml (#5342) 
* Update ja.yml

* Update simple_form.ja.yml
 2017-10-12 12:18:13 +09:00
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.
 2017-10-12 00:58:01 +02:00
kibigo!
8d6b9ba494 Merge upstream 2.0ish #165 2017-10-11 10:43:10 -07:00
JohnD28
fe6941e28e Update doorkeeper.fr.yml (#5317) 2017-10-11 22:04:36 +09:00
Nolan Lawson
bebaa6eced Remove prop types from external libraries (#5304) 2017-10-10 18:44:51 +02:00
Jakob Kramer
616f53eea8 Update German translation (#5302) 2017-10-10 23:12:18 +09:00
Jeong Arm
9d97054fe6 Remove timestamps on any option (#5282) 2017-10-09 17:52:02 +02:00
unarist
7fd66cf2fe Fix migration failure due to StrongMigrations on production env (#5283) 2017-10-09 10:05:35 +02:00
Eugen Rochko
0717d9b3e6 Set snowflake IDs for backdated statuses (#5260) 
- Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity
- Skip for statuses coming from inbox, aka delivered in real-time
- Skip for statuses that claim to be from the future
 2017-10-08 17:34:34 +02:00
m4sk1n
f0c939c431 i18n: Update Polish translation (#5270) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-10-08 16:00:55 +09:00
Jeong Arm
ebadfe0ab7 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
94f15338c3 i18n update Occitan (#5263) 
* Update oc.json

* Update oc.yml

* Update oc.yml

* Update oc.json
 2017-10-08 14:18:27 +09:00
Nolan Lawson
7de6d269d2 Use ES module build of react-router-dom (#5264) 2017-10-08 02:55:58 +02:00
DJ Sundog
96ba3482b9 adding support for audio uploads, transcoded to mp4 videos 2017-10-07 19:54:10 +00:00
nullkal
633426b261 Add moderation note (#5240) 
* Add moderation note

* Add frozen_string_literal

* Make rspec pass
 2017-10-07 20:26:43 +02:00
Eugen Rochko
f486ef2666 Redesign public hashtag pages (#5237) 2017-10-07 20:00:35 +02:00
Eugen Rochko
3a3475450e Encode custom emojis as resolveable objects in ActivityPub (#5243) 
* Encode custom emojis as resolveable objects in ActivityPub

* Improve code style
 2017-10-07 17:43:42 +02:00
Jeong Arm
0e0a9e716c Korean translation (#5244) 
* [i18n] Korean translation

Add missing Korean translations.

[skip ci]

* start ci
 2017-10-07 14:16:59 +09:00
m4sk1n
4413d81d7f i18n: Update Polish translation (#5255) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-10-06 22:43:32 +02:00
Eugen Rochko
eb5ac23434 Clean up code style of Mastodon::TimestampId module (#5232) 
* Clean up code style of Mastodon::TimestampId module

* Update brakeman config
 2017-10-06 03:42:21 +02:00
Eugen Rochko
49cc0eb3e7 Improve admin UI for custom emojis, add copy/disable/enable (#5231) 2017-10-05 23:42:05 +02:00
Lynx Kotoura
32e8a87830 adjust public profile pages 2 (#5223) 2017-10-04 22:49:36 +02:00
Jakob Kramer
636acb5712 Update German translation (#5221) 2017-10-04 20:03:41 +02:00
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
 2017-10-04 15:16:10 +02:00