summaryrefslogtreecommitdiffstats
path: root/conf/locale/locale_de-DE.ini
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-10-21 06:40:44 -0400
committerUnknwon <u@gogs.io>2015-10-21 06:40:44 -0400
commitf17b746a01a6edfc0ad350116313d92c27557f16 (patch)
treeb8872990987c8f4c6136eb63b2ee0d4729a02043 /conf/locale/locale_de-DE.ini
parentfc7959d3bc89b172b3e0f2d0c5fcdcbb09e2408e (diff)
downloadgitea-f17b746a01a6edfc0ad350116313d92c27557f16.tar.gz
gitea-f17b746a01a6edfc0ad350116313d92c27557f16.zip
update locale
Diffstat (limited to 'conf/locale/locale_de-DE.ini')
-rwxr-xr-xconf/locale/locale_de-DE.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/locale/locale_de-DE.ini b/conf/locale/locale_de-DE.ini
index 8af02630e5..ed8ac43e55 100755
--- a/conf/locale/locale_de-DE.ini
+++ b/conf/locale/locale_de-DE.ini
@@ -502,6 +502,7 @@ pulls.can_auto_merge_desc=Du kannst eine Auto-Merge Operation auf diese Pull-Anf
pulls.cannot_auto_merge_desc=Es kann keine Auto-Merge Operation durchgeführt werden, da es Konflikte zwischen den Commits gibt.
pulls.cannot_auto_merge_helper=Bitte benutze ein Kommandozeilentool, um den Konflikt zu lösen.
pulls.merge_pull_request=Pull-Request zusammenführen
+pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
milestones.new=Neuer Meilenstein
milestones.open_tab=%d offen