Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Update strings.js, some new german translations #5212

Merged
merged 3 commits into from
Sep 18, 2013

Conversation

marcelgerber
Copy link
Contributor

New translations of the last few days.

Please also merge #5145, because this commit bases on the other one.

New translations of the last few days.

Please also merge adobe#5145, because this commit bases on the other one.
@marcelgerber
Copy link
Contributor Author

Please assign to @pthiess

@ghost ghost assigned ingorichter Sep 16, 2013
@marcelgerber
Copy link
Contributor Author

Just done.

@ingorichter
Copy link
Contributor

@SAplayer I'm sorry, but would you mind resolving the merge issues? Thanks.

@marcelgerber
Copy link
Contributor Author

What do you mean?

@ingorichter
Copy link
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
@ingorichter ingorichter merged commit b57dfc9 into adobe:master Sep 18, 2013
@marcelgerber marcelgerber deleted the patch-4 branch September 18, 2013 20:28
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants