Commit graph

675 commits

Author SHA1 Message Date
Nolan Lawson
a54c272a1f Add option to reduce motion ()
* 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 ()
* 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 ()
* Update oc.json

* Update oc.yml
2017-10-15 23:07:32 +02:00
Yannick A
c03e2d7c51 Update French translation () 2017-10-15 21:21:05 +09:00
spla
9fc9d3554d Updated Catalan strings ()
* 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 ()
Update French translation
2017-10-14 14:30:19 +02:00
Masoud Abkenar
5c26c3062d l10n: update Persian translation for 2.0 () 2017-10-14 14:28:19 +02:00
Mathias B
1df10e26a8 Correct some misspellings ()
* 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 ()
* 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 () 2017-10-12 21:33:37 +02:00
Alda Marteau-Hardi
dfde574160 Fix some consistance errors in gender neutral formulations. Add some missing ones. () 2017-10-12 16:31:14 +02:00
JohnD28
77cd62882b Update fr.yml ()
* 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 ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-12 16:56:03 +09:00
JeanGauthier
60152a421a Moderation notes () 2017-10-12 15:28:15 +09:00
nullkal
38e5d51b42 Update ja.yml ()
* 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 ()
* 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 () 2017-10-11 22:04:36 +09:00
Jakob Kramer
d24ea1df74 Update German translation () 2017-10-10 23:12:18 +09:00
m4sk1n
d9e51960a2 i18n: Update Polish translation ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-08 16:00:55 +09:00
Jeong Arm
094616ad3f Translate some Esperanto ()
* 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 ()
* 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 ()
* 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 () 2017-10-07 20:00:35 +02:00
Jeong Arm
9ea15ab021 Korean translation ()
* [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 ()
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 () 2017-10-05 23:42:05 +02:00
Jakob Kramer
53105c4210 Update German translation () 2017-10-04 20:03:41 +02:00
utam0k
51f8cbfbeb Implement EmailBlackList ()
* 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 ()
* 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 ()
* yarn manage:translations

* Add Japanese translations for 

* Add Japanese translations for 

* Add Japanese translations for 

* Add Japanese translations for 

* Add Japanese translations for 

* "項目" -> "絵文字"
2017-10-03 13:10:26 +02:00
Jakob Kramer
902e249cdb Update German translation () 2017-10-03 09:53:18 +09:00
m4sk1n
17bcb30c82 i18n: Update translation files and Polish translation ()
* 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 ()
* 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 () 2017-10-01 19:09:45 +02:00
Eugen Rochko
06ef1b0ac4 Reorganize preferences page () 2017-10-01 10:52:39 +02:00
roikale
4f18c27c43 Change wording on landing page. ()
"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 ()
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 () 2017-09-29 13:27:31 +09:00
Jakob Kramer
d55a6ae28a Update German translation ()
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 () 2017-09-28 20:22:34 +02:00
m4sk1n
7291f1de08 i18n: Update Polish translation ()
* 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 ()
- 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 () 2017-09-25 04:04:04 +02:00
Lynx Kotoura
88fd9f47fd Fix theme translations alphabetically () 2017-09-20 19:41:35 +02:00
Lynx Kotoura
42bacb1e30 Better Japanese translations () 2017-09-21 01:56:28 +09:00
mayaeh
0e9e5e0317 Add Japanese translations for multiple themes, custom emoji ()
* 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, ... ()
* 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. ()
* 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 ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-19 23:25:17 +02:00
Andrew
b4842ef0b9 Add support for multiple themes ()
* 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
2017-09-19 16:36:23 +02:00
Eugen Rochko
e9bb7e62b1 Admin interface for listing, adding and removing custom emojis ()
* Admin interface for listing, adding and removing custom emojis

* Only display local ones in the list
2017-09-19 03:52:38 +02:00
Eugen Rochko
327d21b8a4 Run i18n-tasks normalize () 2017-09-19 03:27:08 +02:00
BruWalfas
f4d0774877 A few updates to the Spanish translation and some typos fixing ()
* 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
2017-09-19 07:47:48 +09:00
Lynx Kotoura
8585421eb1 Oauth code in input form and add description message ()
* Oauth code in a input form and add description

* New authcode description
2017-09-17 15:23:44 +02:00
Mingye Wang
9b85c3a13f Minor Chinese check & jsx addition ()
* 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 .

* zh-*: apply suggestions for PR 

* 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
2017-09-16 18:48:38 +02:00
Anna e só
584d2d8e02 l10n: PT-BR translation updated ()
* 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 

* 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
2017-09-15 00:02:38 +02:00
Yamagishi Kazutoshi
175c2a9df2 Add missing Japanese translations () 2017-09-14 18:03:34 +02:00
Masoud Abkenar
d08cf543a3 l10n: update Persian translation () 2017-09-15 00:13:38 +09:00
m4sk1n
4d80e3c550 i18n: Update Polish translation ()
* 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
2017-09-14 21:58:48 +09:00
Jeroen
8cd10e7df6 Another Dutch language update ()
* Update nl.json

* Update nl.yml

* Update nl.json
2017-09-14 21:52:47 +09:00
Quent-in
6279f70e60 l10n update OC/FR video redesign ()
* l10n update for Redesign video player ()

* 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
2017-09-14 16:32:14 +09:00
N氏
3d5170251e Add Japanese translate for () 2017-09-14 12:25:18 +09:00
Eugen Rochko
9ff429aa6d Uploads for admin site settings ()
* Improve OpenGraph tags for about pages

* Add thumbnail admin setting

* Fix error

* Fix up
2017-09-14 00:04:30 +02:00
m4sk1n
5bcb431a46 i18n: Update Polish translation ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-13 20:57:33 +02:00
Jeroen
00b28a45b0 Updating Dutch translation ()
* Update doorkeeper.nl.yml

* Update nl.yml

* Update simple_form.nl.yml

* Update nl.json

* Update en.json

* Update en.json

* Update nl.json
2017-09-13 23:12:29 +09:00
Eugen Rochko
a47a5ab5cd Fix - Limit pinned toots to 5 () 2017-09-13 11:04:32 +02:00
unarist
94fdf7da70 Add section for protocol specific information on the admin page ()
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
2017-09-12 23:06:10 +02:00
Anna e só
d639474d8c l10n: Full PT-BR translation ()
* 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 

* 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
2017-09-11 08:40:29 +09:00
Masoud Abkenar
04183a9675 l10n: update Persian translation ()
* l10n: update Persian translation

* l10n: fix missing Persian translation
2017-09-11 08:35:27 +09:00
m4sk1n
127d51bda7 i18n: Update Polish translation () 2017-09-11 00:25:39 +09:00
yoshipc
92bdd78105 Fix Japanese translation ()
I translated the additional text ( added by )
2017-09-10 20:34:15 +09:00
Eugen Rochko
6628ea4a82 Default follows for new users ()
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)
2017-09-10 09:58:38 +02:00
m4sk1n
1a4beb3122 i18n: Update Polish translation ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-08 05:51:48 +09:00
Masoud Abkenar
add644eeb0 i18n: update Persian translation () 2017-09-06 17:31:54 +02:00
voidSatisfaction
7fc797da23 Translation korean added () 2017-09-04 20:40:01 +02:00
ButterflyOfFire
f4d6ec8562 Update ar.yml ()
Some little changes to "ar" locale
2017-09-04 19:54:12 +02:00
Eugen Rochko
411183520b Fix short number locales ()
Overwrite values from rails-i18n by manually overwriting in every locale.
We want numbers like 1.5K in every language
2017-09-03 22:17:34 +09:00
Andreas Drop
20c0118cad Make german translation more gender neutral () 2017-09-03 15:17:24 +02:00
Quent-in
8d459da1f8 l10n Occitan update for Embed, cancel follow request, ... ()
* Update: some missing strings

* Updates missing strings

* New string

* Update oc.json

* Update oc.yml

* Update oc.json
2017-09-03 18:08:37 +09:00
m4sk1n
e472b79b1e i18n: Improve Polish translation ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-02 20:45:20 +02:00
Yamagishi Kazutoshi
3f517186b3 Add Japanese translate for () 2017-09-02 14:02:29 +02:00
m4sk1n
186416830e Add link to 'noscript' message ()
* Add link to 'noscript' message

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* remove indent
2017-09-02 01:52:28 +02:00
Damien Erambert
ce91ed1322 Update FR locales ()
* 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
2017-09-01 14:09:01 +02:00
Eugen Rochko
2bbb10a186 Refactor Web::PushSubscription, remove welcome message ()
* Refactor Web::PushSubscription, remove welcome message

* Add missing helper

* Use locale of the receiver on push notifications ()

* Remove unused translations

* Fix dir on notifications
2017-09-01 13:35:23 +02:00
Lynx Kotoura
67223002d8 Add japanese translations for shorten display of large numbers () 2017-08-28 08:16:49 +09:00
Eugen Rochko
007d26852d Shorten display of large numbers on public profiles () 2017-08-27 17:04:45 +02:00
mayaeh
9b75d0e730 Add japanese translations for Pinned statuses based on pawoo. ()
Add japanese translations for pin_errors.
2017-08-28 00:03:27 +09:00
Quent-in
9e60ec3c7d i18n Updated strings ( - pinned toot) ()
* Added string for pinned toots

* Pinned toot  + missing string

Somehow I deleted it "enabled_success"

* update after advice
2017-08-25 23:04:52 +09:00
m4sk1n
8728b1b7c1 i18n: Update Polish translation ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-08-25 17:58:31 +09:00
Eugen Rochko
3e20cb7025 Pinned statuses ()
* Pinned statuses

* yarn manage:translations
2017-08-25 01:41:18 +02:00
Quent-in
62d93b1215 l18n update OC new strings () ()
* New strings

* Update

Thin non breaking spaces

* Update

Thin non breaking spaces

* Update

Thin non breaking spaces
2017-08-24 16:16:32 +09:00
m4sk1n
9cfe449c6d Update Polish translation ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-08-23 17:45:29 +02:00
Yamagishi Kazutoshi
ff62a8e3ee Add Japanese translations for , , , and ()
* Add Japanese translations for , , ,  and 

* Do not translate Inbox URL and Outbox URL

* Remove "あなたの"

* Remove "あなたの"
2017-08-23 14:14:22 +02:00
unarist
8a090910c8 Fix Japanese translation () 2017-08-23 20:07:29 +09:00
Eugen Rochko
b13501268f Fix up the applications area ()
- Section it into "Development" area
- Improve UI of application form, index, and details
2017-08-23 00:59:35 +02:00
Colin Mitchell
63b98318c5 Application prefs section ()
* 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
2017-08-22 18:33:57 +02:00
Yamagishi Kazutoshi
9f95da9393 Add delete account link for French () 2017-08-22 18:31:42 +02:00
m4sk1n
cbc3b13ef6 i18n: Minor changes in Polish translation ()
* i18n: Minor changes in Polish translation

* i18n: pl
2017-08-21 07:57:28 +09:00
Quent-in
8aa84cc69e l10n update OC : Redesign public profiles () ()
New strings added to be shown on the new profile page
2017-08-20 21:49:12 +09:00
Naoki Kosaka
8308a51654 Update Japanese Translation. (Redesign public profiles) () 2017-08-17 06:19:37 +09:00
m4sk1n
cf1d082be0 i18n: Update Polish translation ()
* i18n: Update Polish translation

* Update pl.json
2017-08-16 22:14:23 +02:00
Eugen Rochko
2dba0368f8 Redesign public profiles ()
* 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
2017-08-16 17:12:58 +02:00
Quent-in
8e5ac13996 Update ActivityPub () ()
Update: new string + more translations for the time in words
2017-08-16 17:21:34 +09:00
unarist
40ec0f45fb Update /admin/accounts/:id view for ActivityPub ()
* Add protocol field
* Switch protocol specific information according to active protocol
* Hide PuSH subscription related buttons if ActivityPub is active
2017-08-14 14:09:00 +02:00
Sylvhem
1263c0a60a Minor fixes in the French translation ()
* 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-12 01:33:30 +02:00
Quent-in
0aba3f01db l10n Update OC ()
* l10n Update OC 

Link => token
provider => provesidor
+ more generalized way of using present participle

* Update oc.yml
2017-08-10 22:15:26 +02:00
spla
039ea81acd Added new catalan strings ()
* 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-10 21:52:40 +09:00
m4sk1n
34c0f39d72 i18n: Improve admin panel translation (pl) ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-08-09 07:46:21 +09:00
m4sk1n
f127f72d44 It makes no sense to try using invalid or expired link again ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-08-08 00:20:21 +09:00
m4sk1n
8e80cea3e4 i18n: Update Polish translation () 2017-08-07 21:55:25 +09:00
Masoud Abkenar
50c089d5ca i18n: update Persian translation () 2017-08-06 23:50:20 +02:00
Komic
ef3c046936 Fix ()
wrong character, sorry about that~
2017-08-06 21:52:12 +09:00
Komic
9003065063 fr.yml update ()
Translation for https://github.com/tootsuite/mastodon/pull/4523
2017-08-06 17:36:10 +09:00
Daigo 3 Dango
3f59c8a7d1 Translate 'Signed in as' into Japanese () 2017-08-06 03:14:11 +02:00
Quent-in
74eba690f9 l10n OC - Added "signed in as" ()
Neutral form used.
2017-08-06 08:10:53 +09:00
Eugen Rochko
fd69694749 Add "signed in as" header to some pages () 2017-08-05 04:24:58 +02:00
Quent-in
aa1772de1e l10n update Occitan ()
Salutation mailer + invalid reset link.
2017-08-05 01:31:27 +02:00
Krzysztof Jurewicz
e55ecdf48f Fix some mistakes in Polish translation () 2017-08-04 22:43:28 +09:00
Jeroen
fea7c275b2 Dutch strings: typo () 2017-08-04 07:16:25 +09:00
m4sk1n
45ed3ef755 i18n: Update Polish translation ()
* i18n: Update Polish translation

* Update Polish translation
2017-08-03 17:49:53 +02:00
nullkal
62b92a4c0a Redirect to PasswordController#new when reset_password_token is invalid () 2017-08-03 17:45:45 +02:00
asria-jp
6bb6c2393b Update Japanese Translation (authorize_follow) ()
* Update Japanese Translation

* preserve "Unfortunately"("残念ながら")

preserve "Unfortunately"("残念ながら")
2017-08-02 11:49:25 +09:00
Masoud Abkenar
755a7f2646 i18n: update Persian translation ()
* i18n: update Persian translation

* i18n: fix quotes
2017-07-31 19:40:57 +02:00
unarist
15a8d9b0ca Make salutation of email localizable () 2017-07-31 00:18:44 +02:00
unarist
a3df68eea8 Update Japanese translations () 2017-07-30 14:14:41 +02:00
Jeroen
4162b7e772 Dutch: Small fix () 2017-07-29 18:46:40 +02:00
Quent-in
321162b983 i18n update of OC version ()
* Correction of misspellings

* Improve the OC version

* Improve of the OC version

* Improvement of OC version
2017-07-29 00:09:38 +09:00
m4sk1n
24ec1e69b3 i18n: Update Polish translation ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-28 17:53:44 +09:00
Sorin Davidoi
56c021c349 feat(web_push_notifications): Group notifications () 2017-07-28 05:06:22 +02:00
Ratmir Karabut
400cdcd839 Update Russian translation ()
* 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-28 08:16:30 +09:00
m4sk1n
346faaec2b s/PubSubHubbub/WebSub/g ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-26 13:47:41 +02:00
Clworld
d4e188a3fb Update Japanese translations for landing page (for Mobile). () 2017-07-25 22:57:40 +09:00
Jeroen
1c9aac4878 Update and (almost) completing Dutch strings for 1.5 ()
* 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-25 02:12:50 +02:00
m4sk1n
46d52a9d85 i18n: @e43e0e9 (pl) ()
* i18n: @e43e0e9 (pl)

* i18n: fixed typo on Polish translation
2017-07-24 17:15:35 +02:00
Eugen Rochko
fae1d9052b Redesign /terms page ()
* Redesign /terms page

* Fix tests

* Remove unused keys
2017-07-24 17:15:15 +02:00
Eugen Rochko
e43e0e959c Redesign extended information page ()
* Redesign extended information page

* Remove unused keys

* Add $ui-base-lighter-color variable to SCSS
2017-07-24 15:09:08 +02:00
Eugen Rochko
d44456be73 Run i18n-tasks normalize () 2017-07-24 14:30:10 +02:00
sdukhovni
961f103c35 Allow domain blocks that only reject media without silencing or suspending ()
* 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-24 14:26:55 +02:00
m4sk1n
9be9227c38 i18n: Update Polish translation ()
* i18n: Update Polish translation

* i18n: Update Polish translation
2017-07-23 23:57:13 +02:00
Yamagishi Kazutoshi
ec335a5128 Change about_mastodon to about_mastodon_html for all locales () 2017-07-23 23:32:53 +02:00
Yamagishi Kazutoshi
0e677c278d Update Japanese translations for and ()
* Update Japanese translations for 

* Update Japanese translations for 
2017-07-23 23:04:25 +02:00
Eugen Rochko
cdaf19daeb Improve noscript message and style () 2017-07-23 20:28:06 +02:00
Quent-in
f62d565969 i10n Update for Occitan ()
* Update to translate new strings

* Update

* Update

* Indend added

* Update oc.yml
2017-07-23 12:46:40 +02:00
Eugen Rochko
9f232204b8 Run yarn run manage:translations and i18n-tasks normalize () 2017-07-23 01:14:57 +02:00
Damien Erambert
70d4d90813 Update French locales (settings, ToS, & co) ()
* add fr-FR locales to the landing page

* moar french locales

* terms of service/privacy policy

* remove un-used locales in the client (yarn manage:translations)

* update french locales in the client

* remove duplicate locales in fr.yml

* fix typos per PR comments in fr.yml

* put back default messages

* translate untranslated keys on the client

* add "push" after notifications

* correctly ident ToS in fr.yml
2017-07-22 20:28:40 +02:00
Sylvhem
e1257c78e6 Mise à jour de la traduction de la page d’accueil ()
* Mise à jour de la traduction de la page d’accueil

Met à jour les traductions et ajoute les chaînes manquantes suite à la refonte de la page d’accueil.

Update translations and add the strings introduced by the landing page's redesign.

* Correction d’erreurs

Corrige l’indentation de certaines clefs et supprime admin.settings.setting qui n’existe plus dans le projet original.

Fix some indentations and delete admin.settings.setting, which have been removed upstream.
2017-07-22 14:11:46 +02:00
m4sk1n
0add7e293f i18n: @9392d10 (pl) ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-19 10:49:36 +02:00
Damien Erambert
d367c3ce41 fix missing closing <p> tag in ToS in en.yml () 2017-07-19 09:43:46 +02:00
m4sk1n
383c438a44 Fix missing closing <p> tag in ToS in .yml files ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-19 09:43:10 +02:00
Yamagishi Kazutoshi
9392d10250 Add feature to revoke sessions () 2017-07-19 04:59:04 +02:00