[CLOSED] Update strings.js, some new german translations

[core-ai-bot]

Issue by MarcelGerber
Saturday Sep 14, 2013 at 00:14 GMT
Originally opened as adobe/brackets#5212

---

New translations of the last few days.

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

---

MarcelGerber included the following code: https://github.com/adobe/brackets/pull/5212/commits

[core-ai-bot]

Comment by MarcelGerber
Sunday Sep 15, 2013 at 18:20 GMT

---

Please assign to@pthiess

[core-ai-bot]

Comment by MarcelGerber
Monday Sep 16, 2013 at 20:31 GMT

---

Just done.

[core-ai-bot]

Comment by ingorichter
Wednesday Sep 18, 2013 at 05:30 GMT

---

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

[core-ai-bot]

Comment by MarcelGerber
Wednesday Sep 18, 2013 at 12:39 GMT

---

What do you mean?

[core-ai-bot]

Comment by ingorichter
Wednesday Sep 18, 2013 at 16:48 GMT

---

@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.