This repository was archived by the owner on Sep 6, 2021. It is now read-only.
Update strings.js, some new german translations#5212
Merged
ingorichter merged 3 commits intoadobe:masterfrom Sep 18, 2013
Merged
Update strings.js, some new german translations#5212ingorichter merged 3 commits intoadobe:masterfrom
ingorichter merged 3 commits intoadobe:masterfrom
Conversation
New translations of the last few days. Please also merge adobe#5145, because this commit bases on the other one.
Contributor
Author
|
Please assign to @pthiess |
Contributor
Author
|
Just done. |
Contributor
|
@SAplayer I'm sorry, but would you mind resolving the merge issues? Thanks. |
Contributor
Author
|
What do you mean? |
Contributor
|
@SAplayer sorry for the confusion. The github UI doesn't let me merge your PR due to conflicts. I only asked if you would mind resolving these conflicts and update the PR. |
Can't this be done automatically (I've just done it manually)
ingorichter
added a commit
that referenced
this pull request
Sep 18, 2013
Update strings.js, some new german translations
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
New translations of the last few days.
Please also merge #5145, because this commit bases on the other one.