spla
eddbf2e485
Updated Catalan strings ( #5801 )
...
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
2017-11-25 23:22:59 +09:00
Jenkins
7fcbe5faee
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-25 05:17:15 +00:00
Yamagishi Kazutoshi
6a6e49d032
Change navigation link for moderators ( #5812 )
2017-11-25 05:53:54 +01:00
mayaeh
9a930c0623
i18n: Update ja translations ( #5804 )
...
* Add Japanese translations.
* Update Japanese translations.
* Fix japanese translation.
2017-11-24 13:14:31 +01:00
Jenkins
359ba16721
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-24 01:17:20 +00:00
Eugen Rochko
efc97d404c
Add logging of admin actions ( #5757 )
...
* Add logging of admin actions
* Update brakeman whitelist
* Log creates, updates and destroys with history of changes
* i18n: Update Polish translation (#5782 )
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* Split admin navigation into moderation and administration
* Redesign audit log page
* 🇵🇱 (#5795 )
* Add color coding to audit log
* Change dismiss->resolve, log all outcomes of report as resolve
* Update terminology (e-mail blacklist) (#5796 )
* Update terminology (e-mail blacklist)
imho looks better
* Update en.yml
* Fix code style issues
* i18n-tasks normalize
2017-11-24 02:05:53 +01:00
Jenkins
96302f7fd4
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-23 02:17:12 +00:00
SerCom_KC
97bb620b48
i18n: (zh-CN) Add translations for #5746 & #5735 ( #5764 )
2017-11-23 02:49:21 +01:00
kibigo!
eadf1c38a5
Minor fixes
2017-11-21 18:17:38 -08:00
Jenkins
a2e4d79b1c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-21 17:17:11 +00:00
mayaeh
9841d20c97
Add Japanese translations. ( #5769 )
2017-11-21 17:11:33 +01:00
Marcin Mikołajczak
00be86c25d
i18n: Update Polish translation - back-end ( #230 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-21 16:36:22 +01:00
Joan Montané
daec402a58
Update and fix Catalan translation ( #5773 )
...
* Update activerecord.ca.yml
* Update ca.yml
* Update devise.ca.yml
* Update doorkeeper.ca.yml
* Update simple_form.ca.yml
* fix syntax error for ca translation
* fix syntax errors in ca translations
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-21 23:17:28 +09:00
kibigo!
8aeda4f064
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
David Yip
1dc24ece41
Merge remote-tracking branch 'tootsuite/master'
2017-11-19 01:30:29 -06:00
mayaeh
52111769d0
i18n: Update ja translation for moderator badge. ( #5731 )
...
* Update Japanese translation for moderator badge.
* Follows English notation
2017-11-19 04:16:56 +01:00
Lynx Kotoura
8a8bea2e53
Remove translations of default theme ( #5741 )
2017-11-19 04:15:50 +01:00
Yamagishi Kazutoshi
bffc1b880b
Add “staff” badge to admin user pages ( #5735 )
...
* Allow staff badge to change from setting to hidden
* i18n: Update Polish translation
2017-11-19 04:13:57 +01:00
beatrix
34ba45e47c
Merge pull request #226 from glitch-soc/glitch-theme
...
Glitch/Vanilla themes
2017-11-18 20:32:17 -05:00
Marcin Mikołajczak
1f5f446f08
i18n: Update Polish translation ( #5749 )
2017-11-18 21:43:10 +01:00
Eugen Rochko
b89f614bd7
Profile redirect notes ( #5746 )
...
* Serialize moved accounts into REST and ActivityPub APIs
* Parse federated moved accounts from ActivityPub
* Add note about moved accounts to public profiles
* Add moved account message to web UI
* Fix code style issues
2017-11-18 19:39:02 +01:00
Jenkins
cea7dec340
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-18 06:17:14 +00:00
SerCom_KC
e618b6c136
Updating Chinese (Simplified) translations ( #5725 )
...
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Change `静音` to `隐藏`
* i18n: (zh-CN) Add translations for #5087 & #5669
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translation for #5728
2017-11-18 14:35:11 +09:00
kibigo!
b8fdcfd55e
Sets default theme to glitch
2017-11-17 19:32:04 -08:00
David Yip
f1279d8ff3
Merge remote-tracking branch 'origin/master' into merge-upstream
2017-11-17 17:40:00 -06:00
Eugen Rochko
e149067561
Lists ( #5703 )
...
* Add structure for lists
* Add list timeline streaming API
* Add list APIs, bind list-account relation to follow relation
* Add API for adding/removing accounts from lists
* Add pagination to lists API
* Add pagination to list accounts API
* Adjust scopes for new APIs
- Creating and modifying lists merely requires "write" scope
- Fetching information about lists merely requires "read" scope
* Add test for wrong user context on list timeline
* Clean up tests
2017-11-18 00:16:48 +01:00
kibigo!
5845057adb
Themed prefetching
2017-11-16 21:37:08 -08:00
David Yip
5f689cdf78
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-16 22:52:37 -06:00
Yamagishi Kazutoshi
b80a35092e
Redirect to reports when moderator ( #5733 )
2017-11-17 03:26:34 +01:00
Eugen Rochko
21d01d5809
Display moderator badge (green), admin badge changed to red ( #5728 )
2017-11-17 01:22:38 +01:00
Surinna Curtis
02ae609d9a
Merge tootsuite/master at ab48f2b239
2017-11-16 01:21:16 -06:00
mayaeh
7ffee9cc9d
Add Japanese translation for DM block option. ( #5704 )
2017-11-15 03:57:09 +01:00
Eugen Rochko
a71791e3f1
Allow specifying STATSD_NAMESPACE ( #5700 )
2017-11-15 07:22:43 +09:00
Eugen Rochko
80873c1134
Add option to block direct messages from people you don't follow ( #5669 )
...
* Add option to block direct messages from people you don't follow
Fix #5326
* If the DM responds to a toot by recipient, allow it through
* i18n: Update Polish translation (for #5669 ) (#5673 )
2017-11-14 21:12:57 +01:00
SerCom_KC
66a0141691
Updating Chinese (Simplified) translations ( #5643 )
...
* i18n: (zh-CN) Bug fix for note-counter.
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add support.array key for better wording
* Revert "i18n: (zh-CN) Add support.array key for better wording"
This reverts commit 27bf9a946e886213e827cd985d4f62419db57534.
Looks like this commit can't get pass the checks, revert it for now.
* i18n: (zh-CN) Change `客户端` to `应用`
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translations (#5635 )
* i18n: (zh-CN) Change `两步验证` to `双重认证`
* i18n: (zh-CN) Improve translations
2017-11-14 20:44:42 +01:00
Marcin Mikołajczak
fa89e5d911
i18n: Update Polish translation ( #5699 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-14 20:36:11 +01:00
mayaeh
5aca968bb7
Add Japanese translations for moderator roles and its own admin actions. ( #5689 )
2017-11-14 15:53:14 +09:00
Marcin Mikołajczak
57ea54ba00
i18n: fix typo in Polish translation ( #5688 )
2017-11-14 15:52:32 +09:00
Anna e só
c4c9003f84
l10n: PT-BR translation updated ( #5681 )
...
* Improved e-mail messages; delted repeated words
* pt-BR.json translations updated
* Revert "pt-BR.json translations updated"
This reverts commit 108c460531196fed6e6d14f93e8d8d047c835ffd.
* Updated pt-BR.json
* pt-BR.yml updated
2017-11-14 11:07:38 +09:00
KEINOS
e6285715d1
Fix #5652 - Notify too short when abbrev in JA ( #5664 )
...
* Fix #5652 - Notify too short when abbrev in JA
Fix #5652 of the notification message to be understandable when abbreviated.
* Changed quotes as original
Double quote to single and single quote as none. But I am not convinced of this fix.
* Added a single quote as YAMLlint's suggestion
* `bundle exec i18n-tasks normalize`
2017-11-12 16:51:47 +09:00
Marcin Mikołajczak
df48eaec32
i18n: Update Polish translation (for #5635 ) ( #5661 )
...
* i18n: Update Polish translation (for #5635 )
* 😑 🔫
2017-11-11 22:31:20 +01:00
Eugen Rochko
97178b6d86
Add moderator role and add pundit policies for admin actions ( #5635 )
...
* Add moderator role and add pundit policies for admin actions
* Add rake task for turning user into mod and revoking it again
* Fix handling of unauthorized exception
* Deliver new report e-mails to staff, not just admins
* Add promote/demote to admin UI, hide some actions conditionally
* Fix unused i18n
2017-11-11 20:23:33 +01:00
Matt
826dc9ee46
Update en.yml ( #5648 )
...
Changed "Toots with replies" to read "Toots and replies"
2017-11-10 02:58:33 +01:00
Marcin Mikołajczak
5e43ce1fcb
i18n: Update Polish translation ( #5639 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-09 14:23:06 +01:00
nullkal
a12cc41dd4
Translate ja ( #5637 )
2017-11-09 14:22:55 +01:00
Quenty31
a7db7bdd96
i10n OC: Memorial ( #5615 ) + #5467 ( #5623 )
...
* Changed ĩ => ï
* Changed ĩ => ï
* Add ability to disable login and mark accounts as memorial (#5615 )
2017-11-08 15:19:49 +01:00
Eugen Rochko
7f1a0241c1
Add ability to disable login and mark accounts as memorial ( #5615 )
...
Fix #5597
2017-11-07 19:06:44 +01:00
MitarashiDango
7a5fb781ce
Fix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) ( #5617 )
2017-11-07 19:06:30 +01:00
nullkal
19f82492ab
Show the local couterpart of emoji when it exists in /admin/custom_emojis ( #5467 )
...
* Show the local couterpart of emoji when it exists in admin/custom_emojis
* Fix indentation
* Fix error
* Add class table-action-link to Overwrite link
* Make it enable to overwrite emojis
* Make Code Climate happy
2017-11-07 14:49:32 +01:00
Yamagishi Kazutoshi
a624688ebd
Unify file upload to using fog ( #5604 )
2017-11-07 14:30:31 +01:00
Marcin Mikołajczak
a0e1e14a90
i18n: Improve Polish translation ( #5596 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-06 07:06:54 +09:00
Yamagishi Kazutoshi
f0d800d9a9
Update extract-text-webpack-plugin to version 3.0.2 ( #5584 )
2017-11-05 13:07:59 +01:00
beatrix
0daa95befb
add memorial to production.rb
...
in memory of Natalie Nguyen
let her name ring through the ether
2017-11-03 12:34:50 -04:00
Quenty31
b6f057365d
l10n Occitan ( #5586 )
...
* Update OC: time format
Correction for time format according to: https://opinion.jornalet.com/conselh-linguistic-de-jornalet/blog/2379/la-notacion-oraria-en-occitan
Harmonisation words in menu and confirmation windows
* Update for unlisted custum emoji + #5577
* correction subjonctiu
It's either siasque or siague
* Corrections
Any : qual que, in two words, else it means "some".
And "siasque" with S even if I don't pronounce it at all.
* Update oc.json
2017-11-03 17:42:30 +09:00
MitarashiDango
3068add21d
add account search condition (instance domain) ( #5577 )
2017-11-01 14:46:05 +01:00
Yamagishi Kazutoshi
395a88eb5d
Upgrade compression-webpack-plugin to version 1.0.1 ( #5581 )
2017-11-01 14:42:19 +01:00
Nolan Lawson
ba22580c06
Add ServiceWorker caching for static assets ( #5524 )
2017-10-31 12:25:51 +01:00
Yamagishi Kazutoshi
10b30bd94e
Update dependencies for Ruby (2017-10-30) ( #5566 )
...
* Update better_errors to version 2.4.0
* Update binding_of_caller to version 0.7.3
* Update bootsnap to version 1.1.5
* Update browser to version 2.5.2
* Update capistrano to version 3.10.0
* Update capistrano-bundler to version 1.3.0
* Update capistrano-rbenv to version 2.1.2
* Update capybara to version 2.15.4
* Update cld3 to version 3.2.1
* Update fabrication to version 2.18.0
* Update fog-openstack to version 0.1.22
* Update kaminari to version 1.1.1
* Update lograge to version 0.7.1
* Update nokogiri to version 1.8.1
* Update oj to version 3.3.9
* Update ox to version 2.8.1
* Update parallel_tests to version 2.17.0
* Update pkg-config to version 1.2.8
* Update rspec-rails to version 3.7.1
* Update rubocop to version 0.51.0
* Update scss_lint to version 0.55.0
* Update sidekiq to version 5.0.5
* Update sidekiq-scheduler to version 2.1.10
* Update tzinfo-data to version 1.2017.3
* Update webpacker to version 3.0.2
* bundle update
2017-10-31 12:22:32 +01:00
SerCom_KC
282f0d7479
Updating Chinese (Simplified) translations ( #5508 )
...
* i18n: (zh-CN) fix punctuations and spaces
Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines
* i18n: (zh-CN) fix punctuation
* i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes
https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677
* i18n: (zh-CN) Update missing translations
* i18n: (zh-CN) Fixing errors
* i18n: (zh-CN) Fix indent error
* i18n: (zh-CN) Fix language tag
* i18n: (zh-CN) Remove quotes
* i18n: (zh-CN) Update translation (#5485 )
* i18n: (zh-CN) Remove whitespaces, x -> ×
* i18n: (zh-CN) Rewording on time distance
* i18n: (zh-CN) Overall improvements
* i18n: (zh-CN) i18n-tasks normalization
* i18n: (zh-CN) Add missing translation
2017-10-30 12:34:58 +09:00
Alda Marteau-Hardi
29559b2e7a
Fix a grammatical error in the notifications. ( #5555 )
2017-10-29 02:08:37 +09:00
Marcin Mikołajczak
dc5053109b
i18n: Update Polish translation ( #5547 )
2017-10-28 12:43:20 +09:00
Akihiko Odaki
38d5aa3073
Use contenthash for ExtractTextWebpackPlugin ( #5462 )
...
[hash] is not documented.
2017-10-27 23:54:20 +09:00
David Yip
2aec3c073b
Merge branch 'master' into gs-master
2017-10-27 09:45:25 -05:00
nullkal
0a9cc96cdc
Feature: Unlisted custom emojis ( #5485 )
2017-10-27 16:11:30 +02:00
beatrix
ce738197b9
Merge pull request #179 from glitch-soc/keyword-mute
...
Keyword muting
2017-10-25 17:37:48 -04:00
David Yip
eef50289c6
Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
2017-10-25 16:01:20 -05:00
Jenkins
cfc46d7334
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-10-25 16:17:14 +00:00
Ratmir Karabut
51d4add08d
Update Russian translation ( #5517 )
...
* 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
* Update Russian translation
* Fix merge conflicts (revert)
* Update Russian translation
* Update Russian translation (fix)
* Update Russian translation (fix quotes)
* Update Russian translation (fix quotes)
* Update Russian translation (fix)
* Update Russian translation
* Add quotes
* bundle exec i18n-tasks normalize
2017-10-26 00:21:58 +09:00
Anna e só
93255b003f
l10n: PT-BR translation updated ( #5530 )
2017-10-25 23:11:03 +09:00
Matthew Walsh
737ab88c86
Added a timeline for Direct statuses
...
* Lists all Direct statuses you've sent and received
* Displayed in Getting Started
* Streaming server support for direct TL
2017-10-22 18:35:14 -07:00
David Yip
4ab1534f6c
Address unused translation errors.
2017-10-22 01:05:56 -05:00
David Yip
e3f5ec2652
Fill in create, edit, update, and destroy for keyword mutes interface.
...
Also add a destroy-all action, which can be useful if you're flushing an
old list entirely to start a new one.
2017-10-21 14:54:36 -05:00
David Yip
018657a0e0
Spike out index and new views for keyword mutes controller.
2017-10-21 14:54:36 -05:00
David Yip
ebfec40698
Set up /settings/keyword_mutes. #164 .
...
This should eventually be accessible via the API and the web frontend,
but I find it easier to set up an editing interface using Rails
templates and the like. We can always take it out if it turns out we
don't need it.
2017-10-21 14:54:36 -05:00
David Yip
dd4f9f18cb
Merge tag 'v2.0.0' into gs-master
2017-10-18 11:52:04 -05:00
Håkan Eriksson
ecef91e5ca
Some typos and supplementation in sentence structures ( #5441 )
...
* 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
* Swedish - Typos and supplementation in sentence structure
* Update simple_form.sv.yml
* Update sv.yml
* Update sv.yml
Rearranged the alphabetical order.
2017-10-18 13:50:52 +02:00
Jeroen
6235b8a8b1
Dutch: A few strings I found last minute ( #5440 )
...
* Dutch: A few strings I found last minute
* Update simple_form.nl.yml
2017-10-17 23:15:40 +02:00
JeanGauthier
a18201f690
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
15ae7fe6b2
Update German translation ( #5425 )
2017-10-17 12:02:47 +02:00
Yamagishi Kazutoshi
d7063885bc
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
5e6b51e2c9
Normalize locale files ( #5429 )
2017-10-17 11:45:59 +02:00
masarakki
f76a224328
use-DB_NAME-in-development ( #5430 )
2017-10-17 11:45:37 +02:00
Håkan Eriksson
c06052b7cf
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
289723dd1c
Small update Dutch (nl) strings ( #5424 )
...
* Update Dutch strings
* Update Dutch
2017-10-17 01:00:23 +02:00
David Yip
e19bc7835a
Merge remote-tracking branch 'upstream/master' into gs-master
2017-10-16 09:23:59 -05:00
Marcin Mikołajczak
8953c2a918
i18n: Update Polish translation ( #5416 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-16 14:09:51 +02:00
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
David Yip
ec18363c3b
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-16 01:29:02 -05: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
