Eugen Rochko
2a7602cad4
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
2017-04-11 20:43:56 +02:00
blackle
06444bf050
Allow user to disable the boost confirm dialog in preferences
2017-04-11 10:10:16 -04:00
Matt Jankowski
4ada50985a
Pagination improvements ( #1445 )
...
* Replace will_paginate with kaminari
* Use #page instead of #paginate in controllers
* Replace will_paginate.page_gap with pagination.truncate in i18n
* Customize kaminari views to match prior styles
* Set kaminari options to match prior behavior
* Replace will_paginate with paginate in views
2017-04-11 01:11:41 +02:00
Ratmir Karabut
9043b32183
Add Russian translation (ru) ( #1023 )
...
* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
2017-04-10 12:52:06 +02:00
Olivier Humbert
082bef3027
French translation update ( #1271 )
...
* Update confirmation_instructions.fr.html.erb
consistency across the French translation
* Update
consistency across the French translation
* Update fr.yml
a bunch of consistency across the French translation + a few typos
* Update doorkeeper.fr.yml
consistency across the French translation (punctuation)
2017-04-09 14:55:58 +02:00
spf
e6b48a7048
French typo ( #1257 )
...
* French typo
* Datetime french translation
2017-04-09 14:54:47 +02:00
Eugen
9acdb166e8
Fix #795 , fix #704 , fix #835 - 2FA requires confirmation to be enabled ( #1278 )
...
* Fix #795 , fix #704 , fix #835 - 2FA requires confirmation to be enabled
TOTP secret is not shown again after 2FA is enabled
* Clean up
2017-04-08 22:20:08 +02:00
Thomas Citharel
41f8fde83e
Update french translation ( #1148 )
...
Add french translation for emails sent
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Add non-breaking spaces
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
changes and fixes to the nbsps
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
French update
a few fixes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
fixes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-04-08 13:11:16 +02:00
Sebastian Hübner
f860eb7d71
Fixed two translation errors ( #1139 )
...
Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx
2017-04-08 13:03:11 +02:00
Korbinian
8f9a11b642
Update simple_form.de.yml ( #971 )
2017-04-08 13:02:07 +02:00
Jantso Porali
01d8003867
Updated about page in Finnish language ( #1170 )
...
* update faq with default language
* update translation for about page
* update Minio config
Thanks to @Gargon for helping me. I hope this will help others as well
* update import and export translation
* translate emails to finnish
* add finnish translation for emails
* add finnish translation for emails
* add finnish translation
* add missing dot
* update finnish language to emails
* add finnish translation for emails
* add dot and fix typo
* updated some minor typos
* remove language change due breaking emails
And by dev request
* updated minio config by dev request
* updated about page translation
2017-04-08 12:17:34 +02:00
Olivier Humbert
ed3dfd0bee
French translation update ( #1188 )
...
* Update fr.yml
one typo fix
* Update simple_form.fr.yml
one translation consistency
2017-04-08 12:16:49 +02:00
Shel R
fef478781d
Merge branch 'master' into master
2017-04-07 22:21:21 -04:00
Chad Pytel
ad5ddd5e95
Use I18n for media attachment validation errors
...
These are currently user facing errors, but are not localized. This adds the
ability for these messages to be localized.
2017-04-07 14:23:18 -04:00
Jantso Porali
786e6f94b9
Update Finnish translations, add sample Minio config ( #954 )
2017-04-07 12:58:12 +02:00
André Lewin
bf7cefa516
Merge branch 'master' into master
2017-04-05 20:28:58 +02:00
Jantso Porali
837030db98
updated blocking translation
2017-04-05 14:53:35 +02:00
Jantso Porali
deb001bba8
updated two-way auth and preferences translation
2017-04-05 14:49:29 +02:00
Jantso Porali
d3bf0307db
updated translation for about page
2017-04-05 14:47:42 +02:00
JantsoP
20b53e6add
Merge branch 'master' into master
2017-04-05 10:07:17 +02:00
JantsoP
3ec221d3b7
updated reblog to boost translation
...
Since it is that :D
2017-04-05 09:57:25 +02:00
JantsoP
473e4f7813
udpdated display_name translation
2017-04-05 09:52:31 +02:00
JantsoP
b845ef395d
updated reblog translation
2017-04-05 09:51:35 +02:00
Eugen Rochko
667ffafef8
Fix spec
2017-04-05 03:31:26 +02:00
Eugen
086a88f3bb
Merge pull request #863 from Eychics/master
...
Add closed_registrations message on French language
2017-04-05 03:11:13 +02:00
Eugen
e76dd52b08
Merge pull request #818 from JantsoP/master
...
Updated Finnish Translation
2017-04-05 03:09:20 +02:00
Eugen
c12214963e
Merge pull request #866 from kklleemm/patch-1
...
Fix typos on french translations
2017-04-05 03:06:41 +02:00
Eugen
aa8dacbc8a
Merge pull request #792 from chapeaumeinfreund/master
...
Updated and fixed german orthography
2017-04-05 03:05:50 +02:00
Eugen
ce524cbb49
Merge pull request #790 from chapeaumeinfreund/patch-1
...
Updated and fixed german orthography
2017-04-05 03:05:31 +02:00
Eugen
57466d542b
Merge pull request #805 from nevillepark/master
...
Changed "reblogs" to "boosts"
2017-04-05 03:00:57 +02:00
Clément D
350958babf
Fix typos on french translations
2017-04-04 19:09:54 +02:00
Thibaut (Eychics)
9a5d6e9715
Add closed_registrations message on French language
2017-04-04 18:58:19 +02:00
Eugen Rochko
5f54981846
New admin setting: open/close registrations, with custom message, from the admin UI
2017-04-04 15:28:12 +02:00
JantsoP
db4a41cf58
Merge branch 'master' into master
2017-04-04 08:41:46 +02:00
JantsoP
dc89fc17cc
updated translation
2017-04-04 08:29:53 +02:00
Neville Park
ce1ca28594
Changed "reblogs" to "boosts"
2017-04-03 17:45:36 -04:00
axolotl
0700521ef3
added Esperanto (eo)
2017-04-03 20:22:50 +02:00
Eugen Rochko
98a93aa07e
Fix norwegian translation being malformed
2017-04-03 19:50:55 +02:00
Korbinian
ec8029a955
Updated and fixed orthography
2017-04-03 19:10:48 +02:00
Korbinian
7dd5ba42a3
Updated and fixed german orthography
2017-04-03 19:01:17 +02:00
Eugen Rochko
b7c1b12367
Make default admin UI page reports. Add admin UI for creating a domain block
2017-04-03 18:55:06 +02:00
Christopher Kolstad
5cb011b66b
Add Norwegian locale
2017-04-03 16:32:03 +02:00
JantsoP
65d667dc6c
another typo. fuck me
2017-04-03 14:56:13 +02:00
JantsoP
d3fde60297
fixed an sneaky peaky tpy
2017-04-03 14:54:53 +02:00
JantsoP
85a8b62ca2
add finnish translation
...
add finnish translation
2017-04-03 14:43:07 +02:00
JantsoP
97803600ed
add finnish translation
...
add finnish translation
2017-04-03 14:20:50 +02:00
JantsoP
bfa99981e5
Merge branch 'master' into master
2017-04-03 13:50:57 +02:00
JantsoP
b0f4c9b91f
finnish translation
...
finnish translation
2017-04-03 13:25:46 +02:00
JantsoP
f9b4f30de6
updated final translation
...
updated final translation
2017-04-03 13:07:09 +02:00
JantsoP
87854745e9
Create new translation file
...
Still in progress. Should be done shortly
2017-04-03 12:42:09 +02:00
