Skip to content
This repository has been archived by the owner on Mar 3, 2020. It is now read-only.

Updated Language Translations #511

Merged
merged 1 commit into from Jun 6, 2017
Merged

Updated Language Translations #511

merged 1 commit into from Jun 6, 2017

Conversation

justinwray
Copy link
Contributor

  • All languages have been updated to include missing translations.

  • Primarily this will declutter the error log, making debugging far easier.

@justinwray
Copy link
Contributor Author

This commit includes the changes found in PR #509. Once #509 has been merged, this PR can be rebased.

 * All languages have been updated to include missing translations.

* Primarily this will declutter the error log, making debugging far easier.
@justinwray
Copy link
Contributor Author

This PR is now mergeable.

Given rebase conflicts: the branch was reset (hard) to the upstream dev branch, and then the PR changes were patched and merged onto dev, submitted via a (force) push. All relevant commit log data has been retained in the final commit message.

@gsingh93 gsingh93 merged commit b9f031e into facebookarchive:dev Jun 6, 2017
@justinwray justinwray mentioned this pull request Aug 5, 2017
justinwray added a commit that referenced this pull request Aug 5, 2017
Merge of `dev` into `master`

Commits:

* Registration enforcing strong passwords (#442) (ac64f55)
* Custom branding for icon and text (#448) (081062c)
* Merge of /master into /dev - Baseline for Development (#509) (25c1748)
* Updated Language Translations (#511) (b9f031e)
* Auto Announcements and Activity Log Expansion (#513) (323ba05)
* Level Import Fix (#514) (dc7c87c)
* Announcements Controls Rename (#515) (c5da9f7)
* Set Default Scoring Cache Values (#516) (ec996a5)
* Unique Logos Per Team # (#517) (6d4f919)
* Custom Branding Update (#518) (ea78f6a)
* Backup and Restore settings.ini on Tests (#519) (eb4a5b5)
* Maintain Team Protection on Database Reset (#520) (5d91ae9)
* Fixed Login Form JS Bug (Fixes: #521) (#523) (2b1474b)
* Level Deletion Confirmation and Bug Fixes (#512) (4a7b5b5)
* Provision Streamlined, Quick Setup Added, and Multiple Containers Support (#535) (b487fc1)
* Merge branch 'dev' into WraySec/fbctf/merge@7f8c281
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants