summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2014-11-06 22:06:41 -0500
committerUnknwon <joe2010xtmf@163.com>2014-11-06 22:06:41 -0500
commit23eec252748c3ac7af2ae310aeac4ee4c9061fe9 (patch)
tree9f9d8834ef94451da2fb1d43ba63d0f130d61f79 /conf
parent4e7eb5be9d3e9c9ba7238769d2b5f2f471d51b67 (diff)
downloadgitea-23eec252748c3ac7af2ae310aeac4ee4c9061fe9.tar.gz
gitea-23eec252748c3ac7af2ae310aeac4ee4c9061fe9.zip
Fix #605, fix #255, fix #101
Diffstat (limited to 'conf')
-rw-r--r--conf/locale/locale_en-US.ini2
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 5380ce8245..6d4c13c5ae 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -168,6 +168,8 @@ org_still_own_repo = This organization still have ownership of repository, you h
still_own_user = This authentication still has used by some users, you should move them and then delete again.
+target_branch_not_exist = Target branch does not exist
+
[user]
change_avatar = Change your avatar at gravatar.com
join_on = Joined on