Repository navigation
Update 'de' locale for sprint 24, 25 - #3641
Conversation
There was a problem hiding this comment.
Wouldn't something like "Offene Dateien" be more appropriate?
Use suggestion by @WebsiteDeveloper
ghost
assigned
There was a problem hiding this comment.
These duplicate keys are causing the build errors on Travis CI.
|
@mynetx Thanks for reviewing and updating.I'm ok with merging this once the merge conflicts have been resolved. Thanks, |
|
@pthiess The conflicts have already been resolved, see CI: https://travis-ci.org/adobe/brackets/builds/7098394. |
There was a problem hiding this comment.
Looks like this is duplicated from line 274.
|
Travis picked up one more duplicate key. See my recent comment. |
|
@mynetx Please remove line 297 and I or Jason will go ahead and merge it in. Thanks a ton again for keeping German up to date. |
Update 'de' locale for sprint 24, 25
|
It looks like this merge has just removed the require/text/i18n submodules. |
|
We should probably have docs somewhere about how to make sure submodules are properly handled during a merge. This has bitten @larz0 as well, and is becoming more common now that we have more submodules being updated more frequently. I'm out right now, but we should have someone fix this ASAP. |
|
Also, we should add something to the pull request checklist to double check that there don't seem to be any spurious submodule SHA changes before merging. |
|
Submodules fixed in #3895 |
@pthiess