m4sk1n 
							
						 
					 
					
						
						
							
						
						a38b34c37a 
					 
					
						
						
							
							i18n: Updated Polish translation ( #4068 )  
						
						... 
						
						
						
						* i18n: Updated Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in >
* fuggin nano 
						
						
					 
					
						2017-07-04 23:34:00 +02:00 
						 
				 
			
				
					
						
							
							
								Gyuhwan Park 
							
						 
					 
					
						
						
							
						
						1921ab40ea 
					 
					
						
						
							
							i18n: Update korean translation ( #4066 )  
						
						... 
						
						
						
						* Added Korean Translation (based on japanese)
* Update korean translation
* Update korean translation: fix syntax error
* Updated korean translation
* Update korean translation
* Update ko.json
Translate non-translated parts
* Update ko.yml
Translated missed parts - and fixed some typos
* Create simple_form.ko.yml
* Updated korean translation
* i18n: fix test fails
* Updated korean translation 
						
						
					 
					
						2017-07-04 17:09:17 +02:00 
						 
				 
			
				
					
						
							
							
								Minori Hiraoka 
							
						 
					 
					
						
						
							
						
						976c18aa5f 
					 
					
						
						
							
							Fix Korean translation ( #4065 )  
						
						... 
						
						
						
						* Added Korean Translation (based on japanese)
* Update korean translation
* Update korean translation: fix syntax error
* Updated korean translation
* Update korean translation
* Update ko.json
Translate non-translated parts
* Update ko.yml
Translated missed parts - and fixed some typos
* Create simple_form.ko.yml
* Update simple_form.ko.yml
Translation error fix - password change form
* Update simple_form.ko.yml
* Update ko.json
Missing translation 
						
						
					 
					
						2017-07-04 16:48:22 +02:00 
						 
				 
			
				
					
						
							
							
								Gyuhwan Park 
							
						 
					 
					
						
						
							
						
						4cddef1cea 
					 
					
						
						
							
							i18n: Add korean translation ( #4064 )  
						
						... 
						
						
						
						* Added Korean Translation (based on japanese)
* Update korean translation
* Update korean translation: fix syntax error
* Updated korean translation
* Update korean translation
* Update ko.json
Translate non-translated parts
* Update ko.yml
Translated missed parts - and fixed some typos
* Create simple_form.ko.yml
* Updated korean translation
* i18n: fix test fails 
						
						
					 
					
						2017-07-04 16:11:23 +02:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						275c5b51ed 
					 
					
						
						
							
							Customizable privacy policy from admin interface ( #4062 )  
						
						
						
						
					 
					
						2017-07-04 15:19:24 +02:00 
						 
				 
			
				
					
						
							
							
								のら 
							
						 
					 
					
						
						
							
						
						be94f9e35d 
					 
					
						
						
							
							Update Japanese translation ( #4051 )  
						
						
						
						
					 
					
						2017-07-03 11:02:59 +02:00 
						 
				 
			
				
					
						
							
							
								Ratmir Karabut 
							
						 
					 
					
						
						
							
						
						331f0953e9 
					 
					
						
						
							
							Update Russian translation (sessions) ( #4041 )  
						
						... 
						
						
						
						* 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) 
						
						
					 
					
						2017-07-03 01:30:22 +02:00 
						 
				 
			
				
					
						
							
							
								Damien Erambert 
							
						 
					 
					
						
						
							
						
						133b892e0d 
					 
					
						
						
							
							Update French locales ( #4034 )  
						
						... 
						
						
						
						* add missing locales for French translation
* accent "Media" in the front-end locales
* images => médias
* Change 'rapport' to 'signalement' in French locales to be more coherent
* fix typo
* remove duplicate EN locale
* translate missing locales
* update missing locale
* fix typo
* unify with "utilisateur⋅ice⋅s"
* address PR comments 
						
						
					 
					
						2017-07-02 18:36:35 +02:00 
						 
				 
			
				
					
						
							
							
								unarist 
							
						 
					 
					
						
						
							
						
						d1d94216d1 
					 
					
						
						
							
							Update Japanese translation (Credentials -> Security) ( #4025 )  
						
						
						
						
					 
					
						2017-07-01 21:18:38 +02:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						e4fee6c138 
					 
					
						
						
							
							Add Japanese translations ( #3985 )  
						
						... 
						
						
						
						ref #3929 , #3935 , #3949 , #3981  
						
						
					 
					
						2017-06-28 16:45:21 +02:00 
						 
				 
			
				
					
						
							
							
								m4sk1n 
							
						 
					 
					
						
						
							
						
						fb421a1f46 
					 
					
						
						
							
							i18n: added email to activerecord.pl.yml ( #3981 )  
						
						
						
						
					 
					
						2017-06-28 14:07:53 +02:00 
						 
				 
			
				
					
						
							
							
								m4sk1n 
							
						 
					 
					
						
						
							
						
						2a9805b987 
					 
					
						
						
							
							i18n: Minor fix in devise.pl.yml ( #3978 )  
						
						
						
						
					 
					
						2017-06-27 23:14:02 +02:00 
						 
				 
			
				
					
						
							
							
								m4sk1n 
							
						 
					 
					
						
						
							
						
						da42bfadb5 
					 
					
						
						
							
							i18n: E-mail notifications to admins about new reports (pl) ( #3975 )  
						
						
						
						
					 
					
						2017-06-27 22:21:35 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						42b8220632 
					 
					
						
						
							
							Fix   #1624  - Send e-mail notifications to admins about new reports ( #3949 )  
						
						
						
						
					 
					
						2017-06-27 00:04:00 +02:00 
						 
				 
			
				
					
						
							
							
								m4sk1n 
							
						 
					 
					
						
						
							
						
						646de92781 
					 
					
						
						
							
							i18n: Updated Polish translation ( #3956 )  
						
						... 
						
						
						
						* i18n: Updated Polish translation
* Update pl.yml 
						
						
					 
					
						2017-06-26 17:18:45 +02:00 
						 
				 
			
				
					
						
							
							
								m4sk1n 
							
						 
					 
					
						
						
							
						
						ae2b722f55 
					 
					
						
						
							
							i18n: Warning to look into the spam folder (pl) ( #3955 )  
						
						
						
						
					 
					
						2017-06-26 17:10:54 +02:00 
						 
				 
			
				
					
						
							
							
								Alda Marteau-Hardi 
							
						 
					 
					
						
						
							
						
						f53ed108b0 
					 
					
						
						
							
							Translate pin/unpin and fix some inconsistencies in gender neutral strings ( #3952 )  
						
						
						
						
					 
					
						2017-06-26 13:04:36 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						5e8d037e27 
					 
					
						
						
							
							Fix   #3910  - Require OTP authentication to disable 2FA ( #3935 )  
						
						... 
						
						
						
						* Fix  #3910  - Require OTP authentication to disable 2FA. Also, remove ability
to generate new OTP backup codes *after* initial backup codes were handed
out during activation
* Restore recovery code re-generation
* Improve display of some 2FA elements 
						
						
					 
					
						2017-06-25 23:51:46 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						d821aba002 
					 
					
						
						
							
							Rename "Credentials" page to "Security" for clarity ( #3941 )  
						
						... 
						
						
						
						* Rename "Credentials" page to "Security" for clarity
* Change "security" icon from cog to lock 
						
						
					 
					
						2017-06-25 22:13:02 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						f7301bd5b9 
					 
					
						
						
							
							Add overview of active sessions ( #3929 )  
						
						... 
						
						
						
						* Add overview of active sessions
* Better display of browser/platform name
* Improve how browser information is stored and displayed for sessions overview
* Fix test 
						
						
					 
					
						2017-06-25 16:54:30 +02:00 
						 
				 
			
				
					
						
							
							
								Ratmir Karabut 
							
						 
					 
					
						
						
							
						
						9ca02a00a6 
					 
					
						
						
							
							Update Russian translation ( #3902 )  
						
						... 
						
						
						
						* 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 
						
						
					 
					
						2017-06-22 23:28:58 +02:00 
						 
				 
			
				
					
						
							
							
								Quent-in 
							
						 
					 
					
						
						
							
						
						98fab24bea 
					 
					
						
						
							
							Update of doorkeeper.oc.yml ( #3896 )  
						
						... 
						
						
						
						Just some adjustements 
						
						
					 
					
						2017-06-22 13:39:13 +02:00 
						 
				 
			
				
					
						
							
							
								m4sk1n 
							
						 
					 
					
						
						
							
						
						da6fa029f6 
					 
					
						
						
							
							i18n: Fixed typo in Polish translation ( #3864 )  
						
						
						
						
					 
					
						2017-06-20 18:34:27 +02:00 
						 
				 
			
				
					
						
							
							
								のら 
							
						 
					 
					
						
						
							
						
						5cc7cd8518 
					 
					
						
						
							
							Add Japanese translation "Action taken by" ( #3850 )  
						
						
						
						
					 
					
						2017-06-19 15:12:41 +02:00 
						 
				 
			
				
					
						
							
							
								spla 
							
						 
					 
					
						
						
							
						
						4367443287 
					 
					
						
						
							
							Added new Catalan strings ( #3843 )  
						
						... 
						
						
						
						* 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 
						
						
					 
					
						2017-06-19 10:29:18 +02:00 
						 
				 
			
				
					
						
							
							
								Quent-in 
							
						 
					 
					
						
						
							
						
						8fd931dc12 
					 
					
						
						
							
							l10n update for account deletion  ( #3820 )  
						
						... 
						
						
						
						* l10n update for acount deletion
* l10n little change
* l10n little changes
Less passive voice, more natural.
* Update oc.yml
Correction, " added 
						
						
					 
					
						2017-06-17 20:21:25 +02:00 
						 
				 
			
				
					
						
							
							
								m4sk1n 
							
						 
					 
					
						
						
							
						
						6f34fdb616 
					 
					
						
						
							
							updated Polish translation ( #3751 )  
						
						... 
						
						
						
						Signed-off-by: Marcin Mikołajczak <me@m4sk.in > 
						
						
					 
					
						2017-06-15 02:00:23 +02:00 
						 
				 
			
				
					
						
							
							
								unarist 
							
						 
					 
					
						
						
							
						
						da0333f1cb 
					 
					
						
						
							
							Add Japanese translation for Account deletion ( #3747 )  
						
						
						
						
					 
					
						2017-06-14 22:00:08 +02:00 
						 
				 
			
				
					
						
							
							
								m4sk1n 
							
						 
					 
					
						
						
							
						
						98eacb2238 
					 
					
						
						
							
							i18n: updated Polish translation ( #3744 )  
						
						
						
						
					 
					
						2017-06-14 20:08:00 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						4a618908e8 
					 
					
						
						
							
							Account deletion ( #3728 )  
						
						... 
						
						
						
						* Add form for account deletion
* If avatar or header are gone from source, remove them
* Add option to have SuspendAccountService remove user record, add tests
* Exclude suspended accounts from search 
						
						
					 
					
						2017-06-14 18:01:27 +02:00 
						 
				 
			
				
					
						
							
							
								Ratmir Karabut 
							
						 
					 
					
						
						
							
						
						9e53fe5c29 
					 
					
						
						
							
							Update Russian translation ( #3692 )  
						
						
						
						
					 
					
						2017-06-11 10:43:01 +02:00 
						 
				 
			
				
					
						
							
							
								m4sk1n 
							
						 
					 
					
						
						
							
						
						778430b54a 
					 
					
						
						
							
							i18n: Minor fixes in Polish translation ( #3674 )  
						
						... 
						
						
						
						* i18n
* i18n
* i18n
* i18n
* i18n 
						
						
					 
					
						2017-06-09 23:08:09 +02:00 
						 
				 
			
				
					
						
							
							
								m4sk1n 
							
						 
					 
					
						
						
							
						
						1a065fb146 
					 
					
						
						
							
							i18n: updated Polish translation ( #3670 )  
						
						
						
						
					 
					
						2017-06-09 19:15:55 +02:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						1be48dd805 
					 
					
						
						
							
							Refactor views/admin/reports/show.html.haml ( #3656 )  
						
						
						
						
					 
					
						2017-06-09 15:08:06 +02:00 
						 
				 
			
				
					
						
							
							
								unarist 
							
						 
					 
					
						
						
							
						
						65d8c73bae 
					 
					
						
						
							
							Add Japanese translation for  #3640  ( #3650 )  
						
						
						
						
					 
					
						2017-06-09 03:14:15 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						8902e265b4 
					 
					
						
						
							
							Add explit admin actions to (re)subscribe/unsubscribe remote accounts ( #3640 )  
						
						... 
						
						
						
						* Add explit admin actions to (re)subscribe/unsubscribe remote accounts
and re-download avatar/header
* Improve how admin NSFW toggle looks 
						
						
					 
					
						2017-06-08 14:58:22 +02:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						7d2b4186c3 
					 
					
						
						
							
							Add Japanese translations ( #3635 )  
						
						
						
						
					 
					
						2017-06-08 13:23:56 +02:00 
						 
				 
			
				
					
						
							
							
								m4sk1n 
							
						 
					 
					
						
						
							
						
						90689190a3 
					 
					
						
						
							
							i18n: Update Polish translation ( #3637 )  
						
						
						
						
					 
					
						2017-06-08 13:23:40 +02:00 
						 
				 
			
				
					
						
							
							
								Sorin Davidoi 
							
						 
					 
					
						
						
							
						
						8acadeea76 
					 
					
						
						
							
							fix: Warn if JavaScript is disabled ( #3634 )  
						
						
						
						
					 
					
						2017-06-08 00:52:56 +02:00 
						 
				 
			
				
					
						
							
							
								jeroenpraat 
							
						 
					 
					
						
						
							
						
						92bb166246 
					 
					
						
						
							
							Rest of 2FA  translated + small fix ( #3630 )  
						
						
						
						
					 
					
						2017-06-07 20:08:34 +02:00 
						 
				 
			
				
					
						
							
							
								m4sk1n 
							
						 
					 
					
						
						
							
						
						30fa5fe1a4 
					 
					
						
						
							
							i18n: updated Polish translation ( #3597 )  
						
						... 
						
						
						
						* i18n: updated Polish translation
* i18n: updated Polish translation
btw it would be nice to have master-based Mastodon instance (even isolated from others) to test translation. 
						
						
					 
					
						2017-06-06 03:59:13 +02:00 
						 
				 
			
				
					
						
							
							
								Quent-in 
							
						 
					 
					
						
						
							
						
						370fa70924 
					 
					
						
						
							
							l10n update for occitan language ( #3557 )  
						
						... 
						
						
						
						* i18n Update : Add preference setting for delete toot modal
Adding a line for "Add preference setting for delete toot modal"
* i18n update for pin/unpin
Update to add two more translations
* i18n update to have the dates in plain occitan
* Removed the blank line
* %{selft} back in the translation 
						
						
					 
					
						2017-06-05 01:31:10 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						f7a30e2fae 
					 
					
						
						
							
							Added support for configurable reserved usernames (fix of  #1382 ) ( #3566 )  
						
						... 
						
						
						
						* Added support for configurable reserved usernames
* Added reserved usernames from mastodon issue 1355
* Fix reserved usernames 
						
						
					 
					
						2017-06-05 01:03:45 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						de4681b2be 
					 
					
						
						
							
							Move admin/pubsubhubbub controller to admin/subscriptions ( #3442 )  
						
						
						
						
					 
					
						2017-05-31 20:39:35 +02:00 
						 
				 
			
				
					
						
							
							
								spla 
							
						 
					 
					
						
						
							
						
						93de41b39b 
					 
					
						
						
							
							Catalan language updates ( #3454 )  
						
						... 
						
						
						
						* 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 
						
						
					 
					
						2017-05-31 02:14:52 +02:00 
						 
				 
			
				
					
						
							
							
								Atsushi Yamamoto 
							
						 
					 
					
						
						
							
						
						402c19a924 
					 
					
						
						
							
							Add preference setting for delete toot modal ( #3368 )  
						
						... 
						
						
						
						* Set delete_modal preference to true by default
* Does not show confirmation modal if delete_modal is false
* Add ja translation for preference setting page 
						
						
					 
					
						2017-05-29 17:56:13 +02:00 
						 
				 
			
				
					
						
							
							
								vidarlee 
							
						 
					 
					
						
						
							
						
						450441fc11 
					 
					
						
						
							
							i18n: Add some tags for Chinese translation ( #3379 )  
						
						... 
						
						
						
						* Enhance for the Chinese translation
* Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175 
* i18n: Add some tags for Chinese translation
* i18n: Add some tags for Chinese translation 
						
						
					 
					
						2017-05-28 16:25:54 +02:00 
						 
				 
			
				
					
						
							
							
								Masoud Abkenar 
							
						 
					 
					
						
						
							
						
						b619362a36 
					 
					
						
						
							
							Persian translation fixes and updates ( #3380 )  
						
						... 
						
						
						
						* Persian translation fix
* Persian translation of new strings 
						
						
					 
					
						2017-05-28 16:25:45 +02:00 
						 
				 
			
				
					
						
							
							
								jeroenpraat 
							
						 
					 
					
						
						
							
						
						f9180823bc 
					 
					
						
						
							
							Update Dutch strings for 1.4 ( #3363 )  
						
						... 
						
						
						
						* Update nl strings for 1.4
* Update nl strings for 1.4
* Update nl strings for 1.4
* nl strings (+1)
More new OTP strings will be translated another time 
						
						
					 
					
						2017-05-27 16:28:32 +02:00 
						 
				 
			
				
					
						
							
							
								Quent-in 
							
						 
					 
					
						
						
							
						
						4b0c667c09 
					 
					
						
						
							
							i18n update for Occitan language ( #3362 )  
						
						... 
						
						
						
						* Update simple_form.oc.yml
* Added check spam folder
* Update oc.json
abonats => seguidors
* Update oc.yml
* Update oc.json
Added translations + corrections
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
* i18n mailer
* Update reset_password_instructions.oc.html.erb 
						
						
					 
					
						2017-05-27 15:50:40 +02:00